Comment 4 for bug 403137
Revision history for this message
| Ted Gould (ted) wrote Re: [Bug 403137] Re: There should never be a conflict merging .bzrignore | #4 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
bbfa235
(Get the code!)
On Wed, 2009-07-22 at 17:59 +0000, John A Meinel wrote:
> Anyway, we could certainly do better about merging .bzrignore in a
> *logical* fashion, rather than a *textual* fashion. But that doesn't
> mean that real-world *logical* changes can't conflict.
Sure, I guess that I'm arguing that in the case of where I've used "bzr
ignore" to add entries to the end it should work. In cases where I've
gone and hand modified the file things are different. I'd guess, for
most users, the use the built in command more than they edit the file.