3 ms·
Solution is to merge one git branch with three commits: new feature+new tests, (optional) new tests for refactor, refactor. I do this using git reset --soft whe
by karmakaze 6y ago
Solution is to merge one git branch with three commits: new feature+new tests, (optional) new tests for refactor, refactor. I do this using git reset --soft when I'm done, even if it means having to split up changes made to the same file across commits. Save the original work and diff new complete changes with original set.