logoalt Hacker News

IgorPartola • yesterday at 7:17 PM • 1 reply • view on HN

I always checkout the branch I am merging something into. I was vaguely aware I could have main checked out but merge foo into bar but have never once done that.

Replies

Sharlin • yesterday at 7:43 PM

  git checkout mybranch
  git rebase main
A conflict happens. Now "ours" is main and "theirs" is mybranch, even though from your perspective you're still on mybranch. Git isn't, however.
➕ show 1 reply