[Beta] Merge to branch other than Master

Anvil Q&A
1

I’m really liking the simplicity of the new Version Control in Beta and appreciate you’re probably not going to want to replicate every single Git/Github style function in it… however…

Something I think would be a huge value add for many people is the ability to merge current branch to a branch other than Master.

My workflow, which I don’t think is uncommon, is to create a new DEV branch to hack away at, then when I’m ready, create a TEST branch from this so the test team and client can kick the tyres and check out the changes, while I continue to work on new DEV and TEST branches. I’ll often want to merge a particular DEV branch to a particular TEST branch (or vice versa) before finally updating with a merge to Master.

A related request, unless there’s an obvious other way to do it, is some way of housekeeping e.g. deleting all the old and unwanted branches rather than just creating more and more.

Thanks!

2

Try a right mouse click. You can already do this.

4 Likes
3

@owen.campbell That’s good to hear thanks, but even now you’ve alerted me I can’t find it… Could you be more specific please?

4

In the version history panel, right mouse click on a commit and select ‘Merge’

merge
merge885×507 69.4 KB

2 Likes
5

Much appreciated - I’ll have a play.

6

I often do this (the answer to your question, already mentioned by Owen):

  • Check out dev
  • Right click on test and Merge

I also sometimes do this:

  • Create a dev2 branch
  • Do some edit with little hope of success

Then, if the changes were unsuccessful:

  • Checkout dev
  • Right click on dev2 and Delete branch dev2

Or, if I like the changes:

  • Check out dev
  • Right click on dev2 and Reset dev branch here
  • Right click on dev2 and Delete branch dev2
1 Like