Colin Hall <[email protected]> writes: > On Thu, Jun 07, 2012 at 12:49:31PM +0200, David Kastrup wrote:
[...] >> > What is your point? >> >> That automatically enforced indentation is not necessarily the best >> choice for colloboration. > > Thanks, that's clear. Our experiences differ. > >> You don't have the choice to make indentation compromises while a >> file is actively being worked on. Reverts and merges often fail. > > Yes, that's a feature. One only gets to check in code that meets the > agreed standard. Compromise the indentation on your own branch. > > I attach a naive example. Comments welcome. You are using Emacs diff. That's not relevant. The tool to consult about merge conflicts is git, and using git in a colloborative setting was what the thread was supposed to be about. -- David Kastrup _______________________________________________ lilypond-user mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-user
