On Aug 9, 2015, at 8:22 AM, arnoldemu wrote: > > The merge is always painful... > > ...I must go and resolve every little thing including whitespace and empty > lines.
If you’re frequently having merge conflicts due to whitespace changes, you’re probably editing the repo contents from two or more different places, so that you have different editor settings creating whitespace differences. The solution is quite independent of Fossil: Every project should have a style guide that sets rules about things like line ending style, tabs vs. spaces, etc. This is not about forcing one person’s style on another, it’s about avoiding this very sort of pointless change in diffs. Before you check something in, make it a habit to say something like “fossil diff | less” to make sure the changes you *think* you are checking in are the changes you are *actually* checking in. If you find that the diff shows a bunch of pointless whitespace changes, you need to work out why those are being caused, and fix *that* problem, not try to “fix” Fossil. _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
