Commit select changes to another branch then resume work on current branch?
This happens often in my work flow: I’m working on a feature in a separate branch, and while doing this I’ll come across small things that need fixing but are from higher up in the framework or site layout for example.
I want to switch back to the main develop branch and commit changes from select files there, then go back to a feature branch, and rebase so that I can continue there with the unrelated tweaks/bugfixes out of the way.
git stash and
git stash pop to do this, but I’m getting a lot of conflicts from a bunch of files I modifed but don’t need to be committed to the parent branch anyway.
Is there another way to avoid conflicts or somehow save the current state, and only pull select working tree changes to another branch for commiting ? (sort of like git-stash-cherry-pick ;-))