Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,363,173
Community Members
 
Community Events
168
Community Groups

Restart merge for specific file

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.

1 answer

0 votes
Seth Rising Star Jun 18, 2014

Yes, I figured this out just this week.

Find the file in the staged changes area. Right click it, and go to Resolve Conflicts>Restart Merge.

This will only restart the merge for the selected file.

Is there any short cut for this?

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events