News for hackers. Stuff that matters.

A comment on Git Tricks: Avoiding merge when dealing with remote conflicts.

Re:Git Tricks: Avoiding merge when dealing with remote confl... by thiht on Tuesday October 22, 2019 @06:52AM (#21322176)
Rebase is not a "trick", it's one of the basic features of git.

If you consider it's a trick, please don't use it, it means you don't understand it yet.

[ Parent | on HN ]
Re:Git Tricks: Avoiding merge when dealing with remote confl... by fcfl on Tuesday October 22, 2019 @11:32AM (#21324800)
By that logic there are no tricks, there are only ever features, basic or otherwise.

If you consider sticking so much to literality, please don't use languages, it means you don't understand them yet.

[ Parent | on HN ]