/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

34 votes302 views6 answers
Git rename branch
Shell/Bash
1 vote253 views1 answer
Do you want to accept these changes and continue updating from this repository?
Shell/Bash
0 vote257 views1 answer
Gen rsa 1024
Shell/Bash
1 vote275 views1 answer
Tailwind vite
Shell/Bash
0 vote320 views1 answer
76 packages are looking for funding run `npm fund` for details found 7 vulnerabilities (5 low, 1 moderate, 1 high) run `npm audit fix` to fix them, or `npm audit` for details
Shell/Bash
2 votes289 views2 answers
Move a file from one directory to another in linux
Shell/Bash
0 vote333 views1 answer
Uninstall a rpm
Shell/Bash
2 votes274 views2 answers
Git show whole file at commit
Shell/Bash
0 vote282 views1 answer
Powershell TLS
Shell/Bash
26 votes274 views5 answers
Zsh: command not found: brew
Shell/Bash