/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

1 vote323 views3 answers
New repository
Shell/Bash
1 vote383 views1 answer
Install cassandra ubuntu
Shell/Bash
1 vote345 views1 answer
Cmake openssl linux
Shell/Bash
0 vote335 views1 answer
Libsound2-dev missing
Shell/Bash
12 votes309 views3 answers
Git ignore staged files
Shell/Bash
1 vote298 views1 answer
Connecting to WSL2 server via local network
Shell/Bash
113 votes339 views6 answers
Upgrade npm
Shell/Bash
1 vote330 views2 answers
Orthonormal basis
Shell/Bash
0 vote352 views1 answer
Bash tr squeeze space
Shell/Bash
0 vote328 views1 answer
Git pull your local changes will be overwritten by merge
Shell/Bash