[11.0][MIG] mgmtsystem survey

[jalzaga]

Module mgmtsystem_survey Migration to version 11.0 #200

[etobella]

@jalzaga Can you rebase it in order to review it?

[max3903]

@jalzaga I don't know what you did, but it didn't work as expected. This pull request now includes mgmtsystem and it should not.

Try to rebase using:

git remote add oca git@github.com:OCA/management-system.git
git fetch oca
git rebase -i oca/11.0

[aselcis]

@max3903 First of all, thank you for your guide lines.
This is exactly what I did.
When I did the "git rebase -i oca/11.0" it added the mgmtsystem module in my local directory,
Then it asked me to use git pull to merge the remote branch into mine.
The last step it asked me was a git push to publish the local commits
Please, let me know what is wrong.

[max3903]

@jalzaga You should not pull to merge. You should force the push:

git remote add oca git@github.com:OCA/management-system.git
git fetch oca
git rebase -i oca/11.0
git push -f origin 11.0-mig-mgmtsystem_survey

I am assuming that origin is git@github.com:Aselcis-Consulting/management-system.git

[aselcis]

Thank you @max3903
However it was the "git rebase -i oca/11.0" command what added the mgmtsystem module to my local directory because it was merged recently. The git push -f will add it to the remote git@github.com:Aselcis-Consulting/management-system.git
Anyway , what should I do?

[max3903]

@jalzaga Revert your merge commit (last commit on your branch) and push with -f

git reset --hard HEAD^
git push -f origin 11.0-mig-mgmtsystem_survey

[jalzaga]

This PR is ready to be tested