cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rene Moser <>
Subject Re: [apache/cloudstack] Vyos router plugin (#2105)
Date Sat, 03 Jun 2017 14:26:04 GMT
Hi Matthew

On 06/03/2017 01:50 PM, Matthew Smart wrote:
> This didn't go through the first time for some reason...
> Hey guys,
> I know this is going to take some time to merge. In the meantime, I am
> preparing my design for the next iteration of the plugin which will
> tentatively add DNS, DHCP, VPN, and maybe VRRP (redundant routing)
> support. I am not very familiar with GIT or the PR process. Assuming my
> design phase completes before my PR is merged how should I go about
> starting work on the next iteration of the plugin? Can I create a new
> branch from the branch that is waiting for the PR to be merged and make
> my changes there?

This is possible, just branch off from that branch by

# change to the vyos branch
git checkout <your_current_vyos_branch>

# branch off
git checkout -b <vyos_new_branchname>".

But be aware that if you change your origin branch, it can cause merge
conflicts. While conflicts are not generally a problem, it can cause
some headache if you are not familiar with it.

In case that happens or if you have questions, don't hesitate to ask
here again.


View raw message