You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
When a merge has conflicts, Sourcetree's default commit message is
Merge branch '<branch name>'
If you edit this message, Sourcetree will replace your message with the default if you switched to another view (e.g. History) or to another application's window.
Sourcetree should set the default message once and let the user edit it without further modifications.
To reproduce the bug, create a new directory and run this script:
git add my_file.txt
echo Hello > my_file.txt
git commit -am 'initial'
git checkout -b new_branch
echo Hey > my_file.txt
git commit -am 'first commit on new_branch'
git checkout master
echo Hi > my_file.txt
git commit -am 'second commit on master'
Open this repo in Sourcetree, merge new_branch , edit the default message and don't commit yet, change view to History to switch to another application.