Re: Really beginner on Version Control

I really appreciate your help. All of you. This is all starting to make sense
to me thanks to you guys.

Now, what are the possible ways that we can get to a conflict when merging
branches ? I'm doing some study tests, and some times I get conflicts, some
times I don't. I couldn't really understand what causes them or not yet. 

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).

-- 
View this message in context: http://git.661346.n2.nabble.com/Really-beginner-on-Version-Control-tp5555023p5557145.html
Sent from the git mailing list archive at Nabble.com.