Degraded performance Customers may experience intermittent errors using Community search. Our platform vendor is investigating.
As you can see in the screenshot, my local master is 2 commits behind on the origin.
But I deliberately executed 'Reset master to this commit' and I want the origin/master to follow. So how can I continue with my local master and push to the origin?
When I make a commit on my local master I get this situation:
I obviously don't want to pull but I can't push neither (getting a message that I have to pull first).
If I pull I go back to the commits I didn't want. How can I go on from the 'Last Commit before Upgrading SIS' (locally and remote)?
In the terminal I want to try the following:
git checkout master
git reset --hard e3f1e37
git push --force origin master
# Then to prove it (it won't print any diff)
git diff master..origin/master
git checkout master
I get the following
fatal: Unable to create '~/.git/index.lock': File exists.
Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.
Does this has anything to do with the Bitbucket storage layer incident?
Or what am I missing?
This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.Read more
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs