1.Login to Source Tree
2. Go to Remotes, that list out all features on the server
3. Right Click on the feature that you wanted to be merged, select the option "Check out origin/feature/"feature name ". This feature will appear in your branches.
4. Go to your Branches, select your branch click on the "Merge" button on the top. A pop up will be opened with all branches, select the branch you want to merge and click "Ok", if there is some merge conflicts it will be listed, resolve the conflicts otherwise the merge is successful.
2. Go to Remotes, that list out all features on the server
3. Right Click on the feature that you wanted to be merged, select the option "Check out origin/feature/"feature name ". This feature will appear in your branches.
4. Go to your Branches, select your branch click on the "Merge" button on the top. A pop up will be opened with all branches, select the branch you want to merge and click "Ok", if there is some merge conflicts it will be listed, resolve the conflicts otherwise the merge is successful.
No comments:
Post a Comment