Stacked PRs and support #6
Replies: 2 comments
-
|
It would be a shame to make a new version control without support for stacked commits. |
Beta Was this translation helpful? Give feedback.
-
|
Yes I want to support stacked PRs. And in fact with haxy I think I can do a better job with it because the key implementation challenge is auto-rebasing the child PRs so they remain compatible with their parents. This always has potential for conflicts that must be resolved but in haxy I can minimize conflicts by using patch-based merging (rebasing) rather than the standard three-way merging that git uses. This will all be done server-side so you don't need to xit BTW, you can continue using git. I wrote about the difference between the two types of merging here: https://github.com/xit-vcs/xit/blob/master/docs/patch.md |
Beta Was this translation helpful? Give feedback.
Uh oh!
There was an error while loading. Please reload this page.
-
Hi @xeubie, I am very much here for this ride. I have been a Sapling SCM user locally for some time now, using GitHub for push/pull and pull requests. The one thing we were trying to figure out is stacked PRs, working with a stack and different versions of a pull request. I did some experiments with git notes along the same lines as this.
https://gist.github.com/AdeAttwood/48c1070b08a137c69a0c81cc4e9ef340
This is less of a discussion and more dripping in my ideas that may spark something. Also, support for this project. I have no zig knowledge, but happy to do user testing and try things out.
FYI, I did run through the read me and pushed with Sapling with no issues.
Beta Was this translation helpful? Give feedback.
All reactions