From: FernandoBasso <FernandoBasso.br@gmail.com>
To: git@vger.kernel.org
Subject: Really beginner on Version Control
Date: Tue, 21 Sep 2010 07:42:13 -0700 (PDT) [thread overview]
Message-ID: <1285080133451-5555023.post@n2.nabble.com> (raw)
I am really a beginner in. Bear with me please.
Why do we merge, say a testing branch into the master branch ? What is the
use of it ?
When there is a conflict when merging branches (merging the testing into the
current branch), should I edit the 'current' branch or the 'testing' branch
?
Should both branches have exactly the same code so that they can be merged
without conflicts ?
--
View this message in context: http://git.661346.n2.nabble.com/Really-beginner-on-Version-Control-tp5555023p5555023.html
Sent from the git mailing list archive at Nabble.com.
next reply other threads:[~2010-09-21 14:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-21 14:42 FernandoBasso [this message]
2010-09-21 14:59 ` Really beginner on Version Control 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
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=1285080133451-5555023.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.