Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

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.

Get started Tell me more
Atlassian Community about banner
4,555,526
Community Members
 
Community Events
184
Community Groups

Restart merge for specific file

D K
D K Jun 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.

Answer
Watch
Like Be the first to like this
3706 views

1 answer

0 votes
Seth
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.
Get recognized
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.

View More Comments
Hemang Shah
Hemang Shah Mar 24, 2021

Is there any short cut for this?

Like
Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

See all events