|
|
|
|
|
|
by dbt00
31 days ago
|
|
|
If you feel like fucking around with new source control tools, jj (jujutsu)'s megamerge workflow is really good at this. (If you're not interested, feel free to skip the rest of this). I have each in process workstream in a commit that is merged at the top level, then I have a new wip commit off of that where stuff I'm typing right now sits. It's easy to split/squash/absorb parts of that commit into the right destination, but also to introduce parents of the megamerge that will never get merged. (This is a better/longer writeup of this concept) https://isaaccorbrey.com/notes/jujutsu-megamerges-for-fun-an... |
|
|