Bazaar

  1. Bug #403137
  2. Comment #2

Comment 2 for bug 403137

Revision history for this message
Jelmer Vernooij (jelmer) wrote : Re: [Bug 403137] Re: There should never be a conflict merging .bzrignore

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

Martin Albisetti wrote:
> I think the general feeling is right, but I'm not sure what the
> best way to solve this is.
 There has been talk about file-type-specific merges. Perhaps a custom
merge handler specific to .bzrignore would be an option here?

Cheers,

Jelmer
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iJwEAQECAAYFAkpnUw0ACgkQDLQl4QYPZuUzNQP/fZQYz8tb9IGVi8b/WUvBIYBo
fIoeSPSJN3BkQ7U4cONfg2GIFhUGs56ASt89jgmYGQOCDVAUCgAHEFjNOXYaq0zV
SVGAeIACiTpCehkp2b7D4y9HHUewrAVPOmsrY0nRhNZcuVBbuMeAjfbo0zigRoij
h+dhZlCM6mGV4rVlY94=
=Yurv
-----END PGP SIGNATURE-----