nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Reset master to commit after pushing commits to the origin/master

NikolaLemmens

Screen Shot 2018-01-10 at 11.03.10.png

Hi,

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:

Screen Shot 2018-01-10 at 11.14.49.png 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)?

Accepted answers

NikolaLemmens

Found an answer!

Check here:

https://stackoverflow.com/questions/48203597/git-fatal-error-occurs-while-trying-to-reset-origin-master-to-commit?noredirect=1#comment83388775_48203597

All comments

NikolaLemmens

Well,

After a lot of trying I'm back to my original situation(see screenshot one).

I tried to reverse the two commits 'sis commti' and 'SIS Clean up' but I'm only able to reverse one and then get the message:

Screen Shot 2018-01-10 at 13.37.53.png

How to solve this situation?

Cheers

Nikola

NikolaLemmens

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

But after

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?

NikolaLemmens

Found an answer!

Check here:

https://stackoverflow.com/questions/48203597/git-fatal-error-occurs-while-trying-to-reset-origin-master-to-commit?noredirect=1#comment83388775_48203597