logoalt Hacker News

Sharlinyesterday at 7:43 PM1 replyview on HN

  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.

Replies

IgorPartolayesterday at 7:58 PM

Ah that’s fair. This is why I would do a `git merge main` instead of a rebase here.

show 1 reply