undefined | Better HN

0 pointsem-bee4d ago0 comments

a better (more confusing) example:

i have a branch and i want to merge that branch into main.

is ours the branch and main theirs? or is ours main, and the branch theirs?

0 comments

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.

Sharlin4d ago

  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.

IgorPartola4d ago

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

1 more reply

j / k navigate · click thread line to collapse

0 pointsem-bee4d ago0 comments

a better (more confusing) example:

i have a branch and i want to merge that branch into main.

is ours the branch and main theirs? or is ours main, and the branch theirs?

0 comments

IgorPartola4d ago

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.

Sharlin4d ago

  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.

IgorPartola4d ago

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

1 more reply

j / k navigate · click thread line to collapse