Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Restart merge for specific file

D K June 18, 2014

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
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
June 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.

Hemang Shah March 24, 2021

Is there any short cut for this?

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events