I often have changes I want to ditch, and just accept whatever is in the branch I’m merging. For that case, you can use git checkout –theirs PATH/FILE (or –ours if you’re overriding).
I often have changes I want to ditch, and just accept whatever is in the branch I’m merging. For that case, you can use git checkout –theirs PATH/FILE (or –ours if you’re overriding).