Constant text conflicts - newb needs some help
Daniel Watkins
daniel at daniel-watkins.co.uk
Tue Jul 22 12:52:25 BST 2008
Hi Donn,
On Tue, 22 Jul 2008 08:06:25 +0200
Donn Ingle <donn.ingle at gmail.com> wrote:
> <<<<<<< TREE
> Makeeng a longer file
> with more complicated changes
> =======
> Making a longer file
> weeth more complicated changes
> >>>>>>> MERGE-SOURCE
>
> It seems (to me) that things are so fragile I don't dare make any
> changes, which defeats the whole purpose. Please gimme a hand.
I would argue that, in this case, you do want merge conflicts. Two
lines of text changing next to one another could well completely change
the meaning of the sentence (or the code, in another case). bzr can't
possibly know how to resolve these to make sense, so it has to flag up
the conflict so you can come in and sort it our yourself. :)
If you're confused as to why you got a conflict and the tutorial did
not, there was more distance between the two changes made there, so
bzr's merge algorithm was able to combine both changes.
Hope this helps,
Dan
--
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/9436f94c/attachment.pgp
More information about the bazaar
mailing list