[CityOfThrowaway]

I haven't tried this yet (though I plan to).

One thing I would love is if I could give it a hint and have it extract out certain types of changes into its own branch that could split into a new PR.

I often find myself adding a new, re-usable component or doing a small refactor in the middle of a project. When you're a few commits into a project and start doing side-quests, it's super annoying to untangle that work.

The options are one of:

1. A mega PR (which everybody hates) 2. Methodologically untangling the side quest post-hoc 3. Not doing it

In principle, the "right" thing to do would be to go checkout main, do the side quest, get it merged and then continue.

But that's annoying and I'd rather just jam through, have AI untangle it, and then stack the commits (ala Graphite).

It's easy to verbally explain what stuff is side-quest vs. main quest but it's super annoying to actually do the untangling.

Maybe this tool magically can do that... but I do wonder if some context hints from the dev would help / make it more effective.

[matijsvzuijlen]

In such cases, I generally checkout main, do the side quest, and rebase my original branch on top of it. Then, I can just continue without waiting for the side quest to be merged. Depending on the situation, I may make a separate PR for the side quest, but I don't have to wait for it to get merged.

Alternatively, if you don't like rebasing, you can merge the side quest branch into your project branch instead.

Either way, you don't have to wait for the side quest to get merged.

[edverma2]

Interesting! I’ve faced the same problem where I have a mega PR and spend a lot of time breaking that up into separate PRs. I agree that what you are suggesting is a different but related problem to what this tool currently solves. I’ll start thinking through how this would look, and I’ll go ahead and make a GitHub issue if you or anyone else wants to start a discussion there.

[CityOfThrowaway]

Awesome!

[2YwaZHXV]

I haven't tried it much but this seems like precisely the problem gitbutler is trying to solve