A lot of the conflicts git detects are lines or spaces, or coding style changes. Is there a way to ignore such differences?
| ||||
|
feedback
|
|
This might be a question better suited for stackoverflow. Is it possible for git merge to ignore line ending differences Git merge and fixing mixed spaces and tabs with two branches My preference is to include an indent template and running that before check-in. | |||
|
feedback
|
