GitSavvy icon indicating copy to clipboard operation
GitSavvy copied to clipboard

merge with ignore spaces

Open mercurykd opened this issue 8 years ago • 4 comments

Hot button in BRANCHES allowing merge with a flag ignore-all-space or ignore-space-change.

mercurykd avatar Oct 06 '17 05:10 mercurykd

How do you think this should work?

stoivo avatar Oct 06 '17 18:10 stoivo

[m] merge selected into active branch [x] merge selected into active branch with flag ignore-all-space

for example

mercurykd avatar Oct 06 '17 22:10 mercurykd

hmm, works for one option The problem is that what do you we do when some asks for --no-ff? [z] merge with no-ff [v] merge with ignore-all-space and no-ff

stoivo avatar Oct 08 '17 13:10 stoivo

Maybe like "git reset" in command pallete? ctrl+shift+p -> "git merge" -> select branch -> select option (no-ff/ignore-all-space/no-ff & ignore-all-space/..)

mercurykd avatar Oct 08 '17 14:10 mercurykd