@rhtyd I'm not very used to working with git. Im currently figuring out how to do this. I did the following so far:
git remote add upstream https://github.com/apache/cloudstack.git git rebase upstream/4.11 This fails due to merge conflicts. Tips? [ Full content available at: https://github.com/apache/cloudstack/pull/2827 ] This message was relayed via gitbox.apache.org for [email protected]
