Git Tricks: Avoiding merge when dealing with remote conflicts by from Hacker News on 2019-10-21 21:27 (#4SZ3T) Comments