From: Petr Baudis <pasky@suse.cz>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>, git@vger.kernel.org
Subject: Re: Patch to tutorial.txt
Date: Mon, 20 Nov 2006 14:13:21 +0100 [thread overview]
Message-ID: <20061120131321.GA7201@pasky.or.cz> (raw)
In-Reply-To: <200611200949.32722.jnareb@gmail.com>
On Mon, Nov 20, 2006 at 09:49:31AM CET, Jakub Narebski wrote:
> 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."
next prev parent reply other threads:[~2006-11-20 13:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-19 22:44 Patch to tutorial.txt Paolo Ciarrocchi
2006-11-19 22:59 ` Jakub Narebski
[not found] ` <4d8e3fd30611200030p1d117445qd3f7d619c18a0633@mail.gmail.com>
2006-11-20 8:49 ` Jakub Narebski
2006-11-20 9:10 ` Paolo Ciarrocchi
2006-11-20 9:25 ` Jakub Narebski
2006-11-20 9:34 ` Paolo Ciarrocchi
2006-11-20 13:13 ` Petr Baudis [this message]
2006-11-20 20:11 ` Alan Chandler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061120131321.GA7201@pasky.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=paolo.ciarrocchi@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).