I tried to commit a file in SourceTree not knowing one of my colleagues had recently committed an update to the same file (and others). So now I've got an incomplete Push and an incomplete Pull. When I try to do the Push I get:
error: failed to push some refs to 'https://bitbucket.org/eClinical/analytics-3.0/src/master/'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
When I try to do the Pull I get:
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
I don't care if my changes get crushed because my colleague basically made the same change. I just want to get my environment working "normally" again.
Hello! Any of the following will work:
Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...
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