Roy Stogner <royst...@ices.utexas.edu> writes: > Yelling "We just wanted to strip off trailing white space, what the > hell!?!" at me would also be reasonable. > > There's no need to do any of this any time soon (and certainly not > while Ben's got a major branch outstanding for the communicators > stuff) but it couldn't hurt to chat about what style program and > options we might agree upon.
Note that if you only change whitespace, you can refine the merge strategy, as in $ git merge -X ignore-space-change other-branch which causes much of the merge pain to go away. (PETSc just went through this "uncrustify" process. The project was still on Mercurial at that time, though I was using Git and thus had merge strategies.) ------------------------------------------------------------------------------ Minimize network downtime and maximize team effectiveness. Reduce network management and security costs.Learn how to hire the most talented Cisco Certified professionals. Visit the Employer Resources Portal http://www.cisco.com/web/learning/employer_resources/index.html _______________________________________________ Libmesh-devel mailing list Libmesh-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/libmesh-devel
