Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

After `git merge -s ours master`, the local branch remains all commits behind

Kevin leto
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
April 12, 2023

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.

0 answers

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events