Git creates a new commit (M) that is referred to as a merge commit that results from combining the changes from your feature branch and master from the point where the two branches diverged. Switch to the target branch that you want to integrate the changes to. Jump to Committing to subversion - If you have subversion commit (write) access, you can make changes to the subversion repository. You first have to.
I am new in TortoiseGit. I created one branch named
Angular
. Now I want to merge that code into master
, but I don't know how can I merge code branch Angular
to master
using TortoiseGit(not using command prompt).Please help
angularangular20211 gold badge44 silver badges1212 bronze badges
1 Answer
Switch to the master branch.
Right click in the directory you have your repo, go to TortoiseGit->Merge.
Select the branch your want to merge into master, then put in your merge message, hit ok
- Checkout Master
- TortoiseGit->Merge
- Select branch you want to merge, hit ok
Grinch91Grinch91