Really beginner on Version Control

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.