4 ms·
He must be using push --force in that case.. which seems like a bad practise.
by cjrp 11y ago
He must be using push --force in that case.. which seems like a bad practise.
- yarper 11y agoWhat they're doing is something like branching off a very old version of master, making changes to file A then trying to merge into the latest version of master, which already has a load of changes to file A. They then resolve the conflict by picking "ours", thus ignoring all changes on origin/master in favour of their own old version of master. This doesn't require a --force.
- cjrp 11y agoOh, that seems even worse!