logoalt Hacker News

lmmyesterday at 11:49 PM2 repliesview on HN

I avoid this problem by not rebasing.


Replies

ozimtoday at 6:35 AM

Hey not every rebase has conflicts. I definitely rebase when there are no conflicts, then merge.

When there are conflicts I merge „theirs” into my branch to resolve those so I keep mental model for this side and don’t have to switch. Then rebase then open PR.

show 2 replies
jimbobimbotoday at 2:54 AM

Seriously! I have too many years of software development experience, but I use Visual Studio UX to handle pretty much all git operations. And always merge.

I have better things to do in my life than "internalizing" anything that doesn't matter in the grand scheme of things.

show 1 reply