I use SourceTree to merge between branches. In master branch, FILE-A is changed, and in develop branch, FILE-A is removed. When I merge develop onto master. It will mark this file as conflict.
The question is
1. How to know this file is deleted in branch merged from or deleted in branch merged to? The only way is type "git status" in terminal, it will show "deleted by them" or "deleted by us". I don't know how to get this information from GUI.
2. When I select "Resolve Using Theirs", the file will remain unchanged, not be deleted as I expected. The only way is remove the file by selecting "Remove". It is difficult when there is many conflicts. Now, I must select each file to see if this file is deleted, and do "Add" or "Remove" for each of those files. Then I can resolve remain conflicts with "Resolve Using Theirs" or "Resolve Using Mine". Is there a express way to do this?
I have noticed the same issue (Windows version). If a file changed on one branch and was removed on another, the GUI doesn't really indicate that, it just shows those files in the working copy changes area with the exclamation icon (next to other files that have actual merge conflicts so they are visually identical). On the right, you just see "Unmodified file" and no info.
Trying to resolve the conflict just throws up error dialogs, where I would expect selecting Resolve -> Resolve using theirs would mark the file as Removed. I would also expect a different icon and some info on the right-hand pane indicating explicitly that the conflict is due to a modified file being removed.
It would be a huge UI improvement to have some buttons on the right-hand side or somewhere that show up in a merge situation and make it obvious what your possible actions are (diff tool, take theirs, take mine) and context-aware so in this case the actions could be "take my changes, take theirs (remove file)"
I would say those are big issues indeed, just tried it! :-o
If there is a merge conflict with a deleted file, I also can't tell on file status what happened. Even calling an external diff is disabled! O_o
And "Resolve Using Theirs" didn't delete the file as it should have!
Quite broken stuff there. I'd advice using command line or another tool for now, though for mac there aren't that many options.
As a Belgian, beer-lover and home brewer, beer is one of my great passions. I love the fact that with just a few ingredients (usually just water, hop and malt) you can create so many different tastes...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot