How to edit Git “add patch” hunks/diffs/lines during selective staging?

Question

I have a source file where 2 features have been added. In order to allow cherry-picking, I\'d like to commit that in 2 phases: one for each feature. Until now, in similar si

Answer 1

I usually get merge conflicts from the git stash pop described in @Dan's answer. See git stash and edited hunks for a solution that avoids the conflicts.