How to merge branches from within Studio?

Rushit Patel2 · ‎06-12-2016

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

Chuck Tomasi · ‎06-12-2016

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.

View solution in original post

Noah8 · ‎08-27-2019

Any insight into why this isn't a very high priority (noticing this was raised ~3 years ago). IMO it is a given. ServiceNow already offers integration with source control like GitHub, and all the typical functionality (branching, stashing, committing, etc.). Seems to me that merging should be included with all these features, ESPECIALLY since you can already branch. It is very concerning that "you could render your repository useless" by merely using features that were provided to you as a developer without any safeguards present.

MartiNet · ‎01-24-2019

I kow this is an old thread but this has really helped me today regarding how to merge changes back to the master branch.

Chuck Tomasi · ‎01-28-2019

Still the same way - with stashes. I know the dev team has this on the backlog, but I don't have visibility to the priority on it. Sorry. Perhaps customer support can provide some information.

MartiNet · ‎02-04-2019

Thanks Chuck, I did figure out how to do it via stashes eventually!

I was a bit alarmed at how much data was wiped when I switched branches though.