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

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

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
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

5,774 views 4 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you