In SourceTree (for Windows) is it possible to restart the merge of a specific file.
My use-case is I have 10 files with merge conflicts.
I resolve the merge conflicts for 8 of these files successfully. However, for 2 of the files the conflict resolutions I make are horribly wrong.
The 2 files are marked as resolved and moved to the stage but how can I restart the merge for only these 2 files? Is there a SourceTree option or a Git command I can use?
NOTE: I'd prefer not to reset and re-do the full merge again.
This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.Read more
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
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
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs