Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

Merge is aborted when discarding merge conflicts in source tree 3.2.5.

I am having trouble merging master into my branch with the most recent version of sourcetree.  We are tracking our hex files in the repo so when merging we discard the conflicted hex file and rebuild adding the new rebuilt hex file into the merge.  However on the latest version of source tree if I have a list of staged files from the merge as soon as I discard the hex file (or last conflicting file) the merge is silently reset and the staging area is cleared in its entirety reverting the branch back to its original state.  Note if I use any of the resolve functions  the merge goes through properly.

 

Steps to recreate:

1. Create Branch and make modifications.

2. Modify Master creating change conflicts with changes in branch.

3. Merge Master into current branch (This creates conflicts)

4. Select conflicts in staged files, and select discard.

5. After discarding, Sourcetree will silently abort the merge, clear the file status screen and also discard any successfully merged files.  Leaving your branch right back where you started.

0 answers

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...

3,344 views 4 5
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