Take the 2-minute tour ×
Super User is a question and answer site for computer enthusiasts and power users. It's 100% free, no registration required.

A lot of the conflicts git detects are lines or spaces, or coding style changes. Is there a way to ignore such differences?

share|improve this question

1 Answer 1

up vote 0 down vote accepted

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.

share|improve this answer

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.