How to fork: Best practices and guide

Re:How to fork: Best practices and guide by gcarvalho on Tuesday October 15, 2024 @02:35AM (#41845604)

Re: continuing a partial rebase

I haven’t tried it myself, but since you know commits A and B have already been rebased and had their conflicts resolved, can’t you instead rebase -i on top of the partial-rebase branch and then drop A and B?

I think this way at least you still benefit from the rebase --edit-todo, which you do not when cherry-picking C^..F.

[ Parent | on HN ]

Re:How to fork: Best practices and guide by thaliaarchi on Tuesday October 15, 2024 @06:51AM (#41847200)

Or easier, do an interactive rebase and mark the last commit which is in the partial-rebase branch for editing. Then, do `git reset --hard partial-rebase` and continue the rebase.

[ Parent | on HN ]