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

Merges are truly horrible, though.

They're a commit with two parents, one of which has no real meaning anymore because it doesn't exist anywhere else. They break a lot of tools because of this.



The first parent is (generally) main.

The second parent is the last commit of a series of commits starting at a commit, sometime in the past on the main branch, followed by all the new commits that represent the feature that is being merged.

Merges are horrible, if you don't have a mental model of git that aligns exactly to the above.


> one of which has no real meaning anymore because it doesn't exist anywhere else.

What do you mean? That's the feature branch, what's the issue?




Consider applying for YC's Fall 2026 batch! Applications are open till July 27.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: