From: FernandoBasso <FernandoBasso.br@gmail.com>
To: git@vger.kernel.org
Subject: Re: Really beginner on Version Control
Date: Wed, 22 Sep 2010 04:45:43 -0700 (PDT) [thread overview]
Message-ID: <1285155943433-5558696.post@n2.nabble.com> (raw)
In-Reply-To: <1AF8A1BC-1E52-4385-A0FC-16A04B4724FF@kellerfarm.com>
On 09/22/2010 12:52 AM, Andrew Keller wrote:
> The only thing is, in your example, since master did not progress since
> testing diverged,
> git simply thinks of it as being "behind" testing...
You have used the word 'behind'. I think 'time' what is making me fail to
understand git merging. It depends on which branch I have changed last. Not
only if I changed the same line in both branches. If I change (same line)
the master, commit. Change testing commit. Merge testing into master, they
will not conflict because master haven't changed since testing changed.
Master is "behind" testing.
--
View this message in context: http://git.661346.n2.nabble.com/Really-beginner-on-Version-Control-tp5555023p5558696.html
Sent from the git mailing list archive at Nabble.com.
next prev parent reply other threads:[~2010-09-22 11:45 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 [this message]
2010-09-22 11:49 ` FernandoBasso
2010-09-22 12:50 ` Tor Arntsen
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=1285155943433-5558696.post@n2.nabble.com \
--to=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).