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

This is tricky to pull off on busy projects, as master is continually progressing and all open pull request branches would need to be constantly rebased.

With the Bitbucket approach, you get to see the conflict in the pull request UI, but you should still resolve it locally on your branch before merging to master.



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

Search: