Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
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

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,456,895
Community Members
 
Community Events
176
Community Groups

Completing Merge in Sourcetree

I must be missing something really obvious, but I couldn't get a merge to complete this evening in Sourcetree 4.1.5 on macOS Monterey.  There was a merge conflict in a source file, I launched the external merge editor, resolved conflicts, saved, and closed the external editor.  Sourcetree showed the conflict as resolved, so I right-clicked on it in the file status box and selected "Continue Merge"...but it put me right back where I started, with the same conflicts in the same file!  I tried it a couple times, and every time that I asked Sourcetree to continue the merge, it went back to the start.

In the end, the only way I could get it to continue was manually in the terminal, using "git add" and then "git commit".  That worked perfectly and completed the merge.

Is there something I'm doing wrong?

0 answers

Suggest an answer

Log in or Sign up to answer
TAGS

Atlassian Community Events