Constant text conflicts - newb needs some help

[Daniel Watkins]

On Tue, 22 Jul 2008 15:02:51 +0200
Donn Ingle <donn.ingle at gmail.com> wrote:
> Could you point me to any relevant sections in the docs that talks
> about this some more? Could it be something like - one person per
> given source file at a time? Or one person editing any given
> function? What are the limits to how close edits can be to each other?
There is a section on merging in the User Guide[0], which may help.
Honestly though, resolving conflicts shouldn't be something to be
avoided at all costs and, as you use bzr more, I think you'll find that
it's actually not that big a deal.


[Footnote 0:
http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#merging-changes]

-- 
Daniel Watkins (Odd_Bloke)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080722/0ebb918a/attachment.pgp