-
-
Notifications
You must be signed in to change notification settings - Fork 856
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[11.0] Port of enhancement of geonames import from 10.0 branch #534
Conversation
@pedrobaeza Here I'am again ;) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Travis + runbot error is unrelated.
@pedrobaeza can I help to solve the problem on Travis/Runbot? |
Well, it's a problem with partner_contact_in_several_companies module. That module shouldn't be merged without rebasing. It was in #507 |
@pedrobaeza I've rebased my local repo, so do you suggest to make a branch for partner_contact_in_several_companies to fix all the problems? |
OK |
You can rebase now. |
@pedrobaeza Here it is :) |
The rebase hasn't been correct, as it's includes the changes in |
@pedrobaeza doh! mmm How can i Fix that? Is necessary to rollback that changes and rebase again? |
Rebase interactively for removing that commits |
@pedrobaeza Thank you man as soon as possible I'll do it! |
@pedrobaeza fixed and rebased 👍 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I fast-track, as this has been approved on 10.0
👍 Thank you @pedrobaeza |
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
…umns based on country_id (OCA#534)
Port of the #529