From: Tor Arntsen <tor@spacetec.no>
To: FernandoBasso <FernandoBasso.br@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Really beginner on Version Control
Date: Wed, 22 Sep 2010 14:50:22 +0200 [thread overview]
Message-ID: <AANLkTinDevPY63WDfPTWVsR2xDNCZOU=aPwzu9r-Zpi+@mail.gmail.com> (raw)
In-Reply-To: <1285156189754-5558706.post@n2.nabble.com>
On Wed, Sep 22, 2010 at 13:49, FernandoBasso <FernandoBasso.br@gmail.com> wrote:
> I merge testing into master (without problems) and I change master and merge
> testing into master again (without any further modification). Now, git
> thinks that the changes I've just made in master are more important than the
> old changes in testing ?
Those old changes were already merged, so they won't get merged again.
Git keeps track of which commits have been merged.
If master originally consists of commits A, B, C, then you branch and
make 'testing', then testing will start out with A, B, C. Then you
add D to testing. Now master is A, B, C as before, testing is A, B, C,
D. Then you merge. Now master will be A, B, C, D too. Then you add E
to master: A, B, C, D, E. If you try to merge testing to master again
Git sees that testing contains nothing that's not in master already.
(The letters stand for commits, i.e. changes you commited.)
-Tor
next prev parent reply other threads:[~2010-09-22 12:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 14:42 Really beginner on Version Control FernandoBasso
2010-09-21 14:59 ` Thomas Moulard
2010-09-21 14:59 ` Enrico Weigelt
2010-09-24 19:33 ` Eric Raible
2010-09-24 20:18 ` Enrico Weigelt
2010-09-24 21:25 ` FernandoBasso
2010-09-21 16:40 ` Andreas Ericsson
2010-09-21 23:35 ` Jakub Narebski
2010-09-22 0:13 ` FernandoBasso
2010-09-22 3:52 ` Andrew Keller
2010-09-22 11:45 ` FernandoBasso
2010-09-22 11:49 ` FernandoBasso
2010-09-22 12:50 ` Tor Arntsen [this message]
2010-09-22 22:15 ` Dmitry Potapov
2010-09-22 7:31 ` Thomas Hochstein
2010-09-22 22:13 ` Dmitry Potapov
2010-09-22 22:10 ` Dmitry Potapov
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='AANLkTinDevPY63WDfPTWVsR2xDNCZOU=aPwzu9r-Zpi+@mail.gmail.com' \
--to=tor@spacetec.no \
--cc=FernandoBasso.br@gmail.com \
--cc=git@vger.kernel.org \
/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).