6

How do I ignore leading and trailing whitespace in NetBeans when resolving conflicts during a git merge.

Under Option > Miscellaneous > Diff you can set the diff tool to ignore leading an trailing whitespace but this does not take affect in the NetBeans merge tool.

git supports git merge -Xignore-all-space. Is there as way to pass this flag in NetBeans?

Git Merge and Fixing Mixed Spaces and Tabs with two Branches

Community
  • 1
  • 1
DarVar
  • 16,882
  • 29
  • 97
  • 146

1 Answers1

0

Evan now (2018, 5 years later), that does not seem to be possible through NetBeans alone, if you consider its Git User Guide:

https://netbeans.org/images_www/articles/73/ide/git/merge-small.png

You cannot pass any merge flag to NetBeans, and you cannot set a git config.
That means a regular git merge -Xignore-all-space in command line remains the safest road.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250