/Shell/Bash/Checkout master with previous commit

Checkout master with previous commit

git checkout 307a5cd        # check out the commit that you want to reset to 
git checkout -b fixy        # create a branch named fixy to do the work
git merge -s ours master    # merge master's history without changing any files
git checkout master         # switch back to master
git merge fixy              # and merge in the fixed branch
git push                    # done, no need to force push!

Similar codes

0 vote209 views1 answer
Kubernetes get crd and their namespaces
Shell/Bash
9 votes209 views4 answers
How to install packages from jupyter notebook
Shell/Bash
1 vote185 views1 answer
Install rematch
Shell/Bash
15 votes210 views4 answers
Sass
Shell/Bash
95 votes199 views3 answers
Install angular globally
Shell/Bash
0 vote187 views1 answer
There is no application installed for “shared library” files
Shell/Bash
0 vote199 views1 answer
Maven update pom version multi module
Shell/Bash
-1 vote272 views2 answers
Putty for ubuntu
Shell/Bash
0 vote196 views1 answer
Linux make user like root
Shell/Bash
12 votes178 views1 answer
How to not have to put in credential every push git
Shell/Bash