Ok. Thanks for letting me know. It seems that the tree resyncing guide on github does not work as expected. I will figure out the rebasing flow.
Thx, Ws On Wednesday, May 21, 2014, runseb <g...@git.apache.org> wrote: > Github user runseb commented on the pull request: > > https://github.com/apache/cloudstack-docs-admin/pull/12#issuecomment-43716150 > > thanks for the patch, its applied. > I am not a git expert, but you seem to be adding commits to your pull request. I have already applied some of those, so it ends up being a conflict. > > > --- > If your project is set up for it, you can reply to this email and have your > reply appear on GitHub as well. If your project does not have this feature > enabled and wishes so, or if the feature is enabled but not working, please > contact infrastructure at infrastruct...@apache.org or file a JIRA ticket > with INFRA. > --- >