Git Tricks: Avoiding merge when dealing with remote conflicts

Re:Git Tricks: Avoiding merge when dealing with remote confl... by juped on Monday October 21, 2019 @09:10PM (#21319385)

Depends on your mental model. I think people expect something similar to CVS update at first, and then git surprises them by doing other things.

[ Parent | on HN ]

Re:Git Tricks: Avoiding merge when dealing with remote confl... by rinchik on Monday October 21, 2019 @09:41PM (#21319571)

I don't think git can surprise though... git GUIs on the other hand can be a mystery.

[ Parent | on HN ]