Merging
is another important feature of any version control system. Merging involves joining the changes
from 2 branches.
In general a base [master] branch is maintained, when a major change is to be done a branch is created from the master branch, all the changes are done in the branch and tested. Once the version of the code in the branch is certified as stable it will be merged into the main branch.
In general a base [master] branch is maintained, when a major change is to be done a branch is created from the master branch, all the changes are done in the branch and tested. Once the version of the code in the branch is certified as stable it will be merged into the main branch.
The
current branch will be the target branch of the merge, when you want to merge changes from an iteration branch to
the main branch you will have to switch (Checkout) into the main branch and
then select the iteration branch which you want to merge with the main branch.
Follow
the below steps to perform a branch merge
in SourceTree
