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

We use GitHub Enterprise where I work now. I do sometimes do stacked PRs but GHE does not make it easy. The rebasing and merge conflict resolution can be a headache although git rebase —onto helps a lot.

I previously worked somewhere that used Phabricator. Its “stacked diffs” worked great. I’d use it all the time when working on complex, multipart changes.



Try out the linked tool git-branchless (https://github.com/arxanas/git-branchless, I'm the author). It should help you restore Phabricator-like workflows. In particular, check out the `git sync`, `git restack`, and `git move` commands for handling rebasing and conflict resolution.


Unfortunately I cannot install the rust compiler tool chain or other third party binaries on my work laptop :(


You don’t have the ability to install tools on your work computer? That would be a deal breaker for me.




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

Search: