Cjku/git: Difference between revisions

Line 374: Line 374:


Then, how to fix aborting? Depend on your situation, there are several strategies  
Then, how to fix aborting? Depend on your situation, there are several strategies  
# Force checkout: if you don't call change lose, submit "git checkout -f <branch>" bravely.
# Force checkout: if you don't care change lose at all, submit "git checkout -f <branch>" bravely.
# Hard reset to HEAD: almost the same with previous one.
# Hard reset to HEAD: almost the same with previous one.
# Commit your change: keep everything you change into object store by a new commit,  and reset file you don't care
# Commit your change: keep everything you change into object store by a new commit,  and reset file you don't care
Confirmed users
1,643

edits