wiki/howto/onboarding.md
... ...
@@ -118,6 +118,8 @@ In cases where code was reformatted, you can also ignore all whitespace changes
118 118
119 119
When doing a diff, you can also use the parameters `--ignore-space-at-eol` and `--ignore-space-change`.
120 120
121
+When doing a merge in Eclipse, you can tell the merge editor to do a similar thing by right clicking and selecting "Ignore White Space". Other merge/diff tools also provide such a functionality.
122
+
121 123
#### Additional steps required for Android projects
122 124
123 125
To ensure that all components of the Analysis Suite are working, you should also import all Android projects (mobile/) into your workspace. There are some additional requirements to enable the build process of these projects.