Re:Mergers ruin everything
by codyb on Friday February 04, 2022 @01:34PM
(#30210978)
Great comment and spot on. You can avoid the issue with force by using `—force-with-lease` which won’t push the force if there’ve been changes upstream.
That’s a bunch to type so I alias it to `fwl` In `~/.git config` and use it after rebases.
That’s a bunch to type so I alias it to `fwl` In `~/.git config` and use it after rebases.