What is the best way to use the option 'Merge branchname into current branch'

[yasir Malik]

I want to know that what is the best way to use this command 'Merge branch name into current branch. '



Let us suppose i want to merge master into develop. 
I checkout to master and pull the changes.
Then i go back to develop. 
I right click on master branch and click this option. 
And it will merge into develop. 

IS this correct? 

[bgannin · Accepted solution]

Hi Yasir,

Yes, that's the correct sequence of steps and will do exactly what you're looking for. You'll need to review the merge results, resolve any conflicts, and provide a message for the commit to your current branch.

Cheers,

Brian Ganninger
Product Manager, Sourcetree