Confusing help in 'update' when using the word "merge"
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Low
|
Unassigned |
Bug Description
The first phrase in 'bzr help update' reads:
> This will perform a merge into the working tree, and may generate conflicts.
This triggered a WTF on me, as it made me think about 'bzr merge'.
I couldn't completely understand the concept at hand until I read the 'bzr help working-trees'.
So maybe using a different word would make the issue clearer, making a difference between the "merge" among histories ('bzr merge') and the "merge" of changes into a working-tree.
This is also to say that maybe showing this link on the user guide would benefit the new users to clarify the differences on the pairs branch/checkout and pull/update (the "target types" in 'bzr help reconfigure' provided the final click to my understanding).
On the first pair, I think it should be clearly stated on the starting documentation that the concept is two-dimensional: the boundness of the branch and the "working-treeness" of the branch (but everything is a branch!)... unless I got it all wrong :)
Mental note: In fact, what would happen if I performed a merge into a branch without a working-tree? Can conflicts still arise? And how to manage them?
tags: | added: check-for-breezy |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
...
>
> Mental note: In fact, what would happen if I performed a merge into a
> branch without a working-tree? Can conflicts still arise? And how to
> manage them?
You can't do a merge without a working tree.
John enigmail. mozdev. org/
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAkz Ir2AACgkQJdeBCY SNAAM+wwCcCOs66 zuUgnr+ x0GX6HFGKXKE q/9NplsXde9eu9K rp
kO4An1XXCMIP7nV
=vVtD
-----END PGP SIGNATURE-----