+5

Use the branch name when merging branches & resolving conflicts

Scott Richmond 1 year ago 0

One of the more annoying and complex issues with Git in general is when merging branches or resolving conflicts - Often the dialog of "Use Ours or Use Theirs" or really unhelpful. Not only is it rarely clear what "ours" and "theirs" is, it can often be reversed depending on the merge/rebase/conflict type.

I think SmartGit could really stand out from the crowd if it put a bit more effort into resolving those words into more meaningful ones. Surely it isn't too much work to determine the name of the 2 branches involved? And if it's the same branch, to display the author and date of the 2 commits in question.