Do you want BuboFlash to help you learning these things? Or do you want to add or correct something? Click here to log in or create user.



Tags
#git
Question
Keep changes from only one side of a merge
Answer

$ git checkout --ours -- file1.txt # Use our version of file1, delete all their changes

$ git checkout --theirs -- file2.txt # Use their version of file2, delete all our changes


Tags
#git
Question
Keep changes from only one side of a merge
Answer
?

Tags
#git
Question
Keep changes from only one side of a merge
Answer

$ git checkout --ours -- file1.txt # Use our version of file1, delete all their changes

$ git checkout --theirs -- file2.txt # Use their version of file2, delete all our changes

If you want to change selection, open document below and click on "Move attachment"

pdf

owner: cramer7575 - (no access) - GitNotesForProfessionals.pdf, p55

Summary

statusnot learnedmeasured difficulty37% [default]last interval [days]               
repetition number in this series0memorised on               scheduled repetition               
scheduled repetition interval               last repetition or drill

Details

No repetitions


Discussion

Do you want to join discussion? Click here to log in or create user.