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

A merge commit is just a commit with two parents. You're not affecting the master branch at all when you "merge in master", you're just creating a new commit where the first parent is your branch, and the second parent is the master branch.

If you do things the way you're suggesting, you'll make it really hard to tell what commits were made on your branch. Git clients tend to assume the first parent is the branch you care about.



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

Search: