3 ms·
Is there a way to make Git choose one over the other rather than merging? --mine or --yours or something?
by mcav 18y ago
Is there a way to make Git choose one over the other rather than merging? --mine or --yours or something?
- ivanstojic 18y agoThere's a git merge strategy called "ours" which - as you might guess - does a quasimerge which always results in whatever you have in your HEAD.