#rebasemerges — Public Fediverse posts

I just did my first #GitRebase #RebaseMerges and it was awesome.

So have have these two subfeatures that are independent, and a third subfeature that requires them both, so I make two PRs, feature-1 and feature-2, and one draft. The draft merges the other two and I continue working while people look at the proper PRs.

I discover something while working on the draft that requires a fix to feature-1. So I just:

* commit that fix
* git rebase --rebase-merges $REBASE_BASE --interactive
* in the rebase-todo, move that fix commit to the section that describes the feature-1 branch
* [code]git push my_remote $FIX_COMMIT_NEW_ID:feature-1
* continue working

awesomesauce