News for hackers. Stuff that matters.
Re:Git is too hard by Supermancho on Tuesday November 17, 2020 @09:02AM (#25123802)
> do you just merge updated remote branches into your stale local branches?

Every single developer I work with (or have in the last 8 years) does this. "Messes up the history" ? The merge commit describes that there are uptaken changes from the "main" branch. It doesn't seem to be a problem in practice.

Re:Git is too hard by KptMarchewa on Tuesday November 17, 2020 @09:44AM (#25124244)
It's also not a problem for me, because I squash the commits on merge to master or other remote branch.