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.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Participate in fun challenges
Challenges come and go, but your rewards stay with you. Do more to earn more!
Gift kudos to your peers
What goes around comes around! Share the love by gifting kudos to your peers.
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!
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.
After `git merge -s ours master`, the local branch remains all commits behind
I've executed the following command to merge the master into my branch ignoring all the master conflicts: `git merge -s ours master`. I've used the git shell to execute the command (not sure if in SourceTree is it possible to do the same).
The merge was successfull and I've then pushed all into the origin/master.
The local branch is now marked as "496 commits behind the origin", even if they are on the same commit. How can I solve the problem? This is quite annoing as I cannot understand when I really need to pull.
I've also tried to delete the local branch and create it again, but the result doesn't change.
Thanks a lot in advance.