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

Sure, a merge commit.

    git checkout master
    git merge --no-ff feature-branch



Consider applying for YC's Spring batch! Applications are open till Feb 11.

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

Search: