[MERGE] Switch heading markers to use - instead of =, to fix auto-resolve

John Arbash Meinel john at arbash-meinel.com
Sat Dec 22 12:45:28 GMT 2007


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> Hi all,
> 
> This patch adjusts the heading markers for NEWS to use - instead of =.
> This fixes auto-resolution of text conflicts.  The problem is that
> auto-resolution looks for merge conflict markers, and '========' is a
> merge conflict marker.
> 
> I figure '-' is a reasonable heading marker, but I'm not stuck on it.
> Just let's not bikeshed too long, eh?
> 
> Aaron

Seems okay with me. We do have a ReST guideline about what headings to
use, and there are other .rst documents that this won't help. (Even if
we switch the top level one, most documentation nests deep enough that
we would need to have 3-4 levels.)

But as NEWS is much more likely to conflict than anything else, it needs
easier 'bzr resolve' as well.

BB:approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHbQboJdeBCYSNAAMRAkEfAKDaBmAfNf3wVMSjx2Bn/UMzdjguXwCfSYv8
Fjc7W9m3OyT2G+qUtztEnYs=
=7JJk
-----END PGP SIGNATURE-----



More information about the bazaar mailing list