I\'ve only just started to use GIT and think its wonderful, however I\'m a little confused over what the merge command does.
merge
Let us say we have a workin
If you want to merge changes in SubBranch to MainBranch
git checkout MainBranch
git merge SubBranch