How to merge branches from within Studio?

[Rushit Patel2]

we can create branches from within the the studio but i couldn't find any option of merging those branches with master. so everytime if I wanted to merge any branch i had to open up GitHub and merge branches there. then i have to comeback to studio and do 'apply remote changes' otherwise it would have old master.

is this limitation of studio or am i missing something?

pradeepksharma

[Pradeep Sharma]

Hi Rushit,

Please refer TechNow Episode 26 | Source Control, New in Helsinki - YouTube

Let me know if you have any questions.

[Chuck Tomasi · Accepted solution]

Hi Rushit,

Merging branches does not yet exist within ServiceNow. It is on the roadmap. I do not have a release target at this point. If I hear more, I will post it here.

You can move information between branches by using stashes or exporting the content from one branch (e.g. a business rule and a script include) and importing it using XML export/import.

Please do not manipulate the repository information directly in Git or you could render your repository useless.

[Chuck Tomasi]

Hi Rushit,

Have we answered your question? This is still listed on the unanswered list.

If I have answered your question, please mark my response as correct so that others with the same question in the future can find it quickly and that it gets removed from the Unanswered list.

If you are viewing this from the community inbox you will not see the correct answer button.   If so, please review How to Mark Answers Correct From Inbox View.

Thank you

[Tim Owen]

Chuck, I want to make sure I am interpreting this correctly. I am working on a branch in Studio for one of my applications. Would this be the correct steps?

1. Stash local changes from the branch I am working on.

2. Load the master into studio

3. Use Manage Stashes to apply the recently saved stash

Also, would it be prudent to add a tag to the master before doing this?