logoalt Hacker News

dragochatyesterday at 8:38 PM0 repliesview on HN

exactly the opposite:

"For a complicated long running feature branch" always simpler to repeatedly merge main into dev, easier conflicts solving etc

For simpler cases squash+rebase as default merge strategy trumps leaves a nice clean history.