Re: Really beginner on Version Control
- From
Dmitry Potapov <dpotapov@gmail.com>
- Date
- Sep 22, 2010, 22:13 UTC
- Message-ID
- <AANLkTin60S-6dtSmcYGqQTgBbpqXFLJWhJWfCWgpiA0E@mail.gmail.com>
- In-Reply-To
- <1285114417273-5557145.post@n2.nabble.com>
On Wed, Sep 22, 2010 at 4:13 AM, FernandoBasso <FernandoBasso.br@gmail.com> wrote:
Show 6 quoted lines
> > For instance, I have 'hello' in line 2 of site.php in the master branch. I > go to the testing branch, edit site.php, change 'hello' for 'world' at the > same line, commit and got back to master. I merge testing into master and I > get no conflicts. Shouldn't it conflict ? (site.php in master also contains > the string 'world' in the place of 'hello' now).
Conflicts happen only if two branches have contradictory _changes_ to the same line. If you merge some branch, it means you accept all changes from it. So, if one branch has no changes, and the other branch has some changes then all changes from the other branch will be accepted without any conflict. The special case when there is no changes on your current branch but only on the merged branch is often described as fast-forward merge, because the result merge does not produce any new commit, but only advance the current state to the state of the other branch.
Dmitry