Re: Patch to tutorial.txt
- From
Petr Baudis <pasky@suse.cz>
- Date
- Nov 20, 2006, 13:13 UTC
- Message-ID
- <20061120131321.GA7201@pasky.or.cz>
- In-Reply-To
- <200611200949.32722.jnareb@gmail.com>
On Mon, Nov 20, 2006 at 09:49:31AM CET, Jakub Narebski wrote:
Show 29 quoted lines
> On Mon, 20 Nov 2006, Paolo Ciarrocchi wrote: > > On 11/19/06, Jakub Narebski <jnareb@gmail.com> wrote: > >> Paolo Ciarrocchi wrote: > >> [...] > >>> ------------------------------------------------ > >>> > >>> at this point the two branches have diverged, with different changes > >>> -made in each. To merge the changes made in the two branches, run > >>> +made in each. To merge the changes made in experimental into master run > >> > >> I would rather say: > >> To merge the changes made in the two branches into master, run > > > > Why Jakub? There are only two branches, master and experimental. > > While sitting in master and doing git pull . experimental I would > > expect to merge I did in experimental into master. Changes did in > > master are alreay merged in master. Am I wrong? > > For me, "merge" in "to merge the changes" phrase is merge in common-sense > meaning of the world, not the SCM jargon. Merge the changes == join the > changes, so you have to give both sides, both changes you join. > > Merge the changes == take changes in branch 'experimental' since forking, > take changes in branch 'master' since forking, join those changes > together (merge), and put the result of this joining (this merge) into > branch 'master'. > > On the contrary, in "merge branch 'experimenta' into 'master'" phrase > "merge" is in the SCM meaning of this word.
I personally find the SVM meaning much less confusing, but I can't tell how much I've been contaminated already - "merge in the two branches into master" really strongly suggests to me that it's about some _other_ two branches.
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ The meaning of Stonehenge in Traflamadorian, when viewed from above, is: "Replacement part being rushed with all possible speed."