Merge main into your branch, then merge --no-ff your branch into main. No need t... | Hacker News

Hacker News new | past | comments | ask | show | jobs | submit

login

		Nullabillity 13 days ago \| parent \| context \| favorite \| on: Oh Shit, Git? Merge main into your branch, then merge --no-ff your branch into main. No need to rebase or squash anything.

Izkata 13 days ago [–]

> Merge main into your branch

The same problem GP was trying to avoid is created here, the merge conflict resolution being on the merge commit.

Consider applying for YC's Spring batch! Applications are open till Feb 11.
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact