eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 14:38:45 +00:00
Code Activity

Updated onboarding regarding git and line endings

Browse Source
This commit is contained in:
Steffen Schaefer
2017-05-02 15:40:45 +02:00
parent dbdfb5c124
commit 8cd3d092f1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wiki/howto/onboarding.md
+3 -1
View File
@@ -118,7 +118,9 @@ In cases where code was reformatted, you can also ignore all whitespace changes
When doing a diff, you can also use the parameters `--ignore-space-at-eol` and `--ignore-space-change`.
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.
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.
When a file has "wrong line endings" (line endings are different to what is configured in ".gitattributes" file) and you touch those files without changing the contents, git will potentially show that these files are changed. To get rid of those phantom changes, you can do a "git reset --hard -- path/toFile/in/repository".
#### Additional steps required for Android projects