How do people handle multiple work streams in git? Where you want to keep different sets of work for committing, but want to keep your branches "merged" for testing?
Conversation
Replying to
Multiple branches, possibly in a cascading way, generally, or stashes to push things sideways for a bit
1
1
1
Replying to
Looks like you can merge multiple branches into one. Just have to remember to switch back when making changes, or cherry pick or something back to the specific branch.
2
It's a lot easier to avoid committing to the wrong branch if you put the current one in your prompt. Using `git stash -p -m "reminder about what it is"` is really helpful to split things up for applying in the right branch too.