6/29/2023 0 Comments Winmerge ignore whitespace![]() (I suppose a bit similar to this one, also referenced here). However, the OP uses a pre-commit hook which takes care of said trailing spaces. The OP Callum Macrae reports that, in that case, the merge proceed uninterrupted, and the trailing spaces contained in the pull request patches are applied to the local files. It is worth to merge with -no-commit and review the merge before actual commit. Ks1322 adds in the comments a good advice: This ignores differences even if one line has whitespace where the other line has none. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent. ![]() Should be enough to ignore all space related conflicts during the merge. Or (more precise) git merge -Xignore-space-change
0 Comments
Leave a Reply. |