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

Hacker Newsnew | past | comments | ask | show | jobs | submit

Nullabillity 5 months 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 5 months 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 Fall 2025 batch! Applications are open till Aug 4
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact