Anton Trunov <[email protected]> writes: > For the code version before applying this patch the following scenario > will take place if "git merge -Xignore-all-space remote" gets executed. > > base file: > 1st line > 2nd line > > master file: > 1st line > 2nd line with substantial change > > remote file: > 1st line > 2nd line > > merge result file: > 1st line > 2nd line with substantial change > > So essentially it does what "git merge -s ours remote" does in case if > all their changes are trivial. > This seems like reasonable solution to me: we _are_ trying to ignore > whitespace changes and we are explicit about it.
Now, the above makes readers wonder what happens when you merged master into the remote. I.e. in the opposite direction. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
