+2

Resolve Menu shall show branch name (again)

Andreas75 1 year ago 0

Since our IT installed a new version of SmartGit (22.1.1 #19231) I get a sub-menue to resolve merge conflicts instead of a popup window.

This is not the problem but in the former window there were always the two possible source branch names. In the new menu there is just "Take Ours" and "Take Theirs" and I have no idea which I have to take to get the right file!

Is there a way to display the source branch names or to get back to the former popup window? The current solution is really a problem for me. By the way: our source code files are binary and usually stored with LFS option. So I even cannot compare them by looking to the file content.

Image 754