Skip to content
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

Merged
merged 2 commits into from
Jan 3, 2018
Merged

[11.0] Port of enhancement of geonames import from 10.0 branch #534

merged 2 commits into from
Jan 3, 2018

Conversation

FrancoTampieri
Copy link

Port of the #529

@FrancoTampieri
Copy link
Author

@pedrobaeza Here I'am again ;)

Copy link
Member

@pedrobaeza pedrobaeza left a 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.

@FrancoTampieri
Copy link
Author

@pedrobaeza can I help to solve the problem on Travis/Runbot?

@pedrobaeza
Copy link
Member

Well, it's a problem with partner_contact_in_several_companies module. That module shouldn't be merged without rebasing. It was in #507

@FrancoTampieri
Copy link
Author

@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?

@pedrobaeza
Copy link
Member

OK

@pedrobaeza
Copy link
Member

You can rebase now.

@FrancoTampieri
Copy link
Author

@pedrobaeza Here it is :)

@pedrobaeza
Copy link
Member

The rebase hasn't been correct, as it's includes the changes in partner_contact_in_several_companies

@FrancoTampieri
Copy link
Author

@pedrobaeza doh! mmm How can i Fix that? Is necessary to rollback that changes and rebase again?

@pedrobaeza
Copy link
Member

Rebase interactively for removing that commits

@FrancoTampieri
Copy link
Author

@pedrobaeza Thank you man as soon as possible I'll do it!

@FrancoTampieri
Copy link
Author

@pedrobaeza fixed and rebased 👍

Copy link
Member

@pedrobaeza pedrobaeza left a 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

@pedrobaeza pedrobaeza merged commit 2e83c16 into OCA:11.0 Jan 3, 2018
@FrancoTampieri
Copy link
Author

👍 Thank you @pedrobaeza

aitorbouzas pushed a commit to aitorbouzas/partner-contact that referenced this pull request Oct 16, 2018
pedrobaeza pushed a commit to aitorbouzas/partner-contact that referenced this pull request Jan 30, 2019
victormmtorres pushed a commit to Tecnativa/partner-contact that referenced this pull request Mar 25, 2019
pedrobaeza pushed a commit to Tecnativa/partner-contact that referenced this pull request Sep 30, 2019
pedrobaeza pushed a commit to Tecnativa/partner-contact that referenced this pull request Oct 4, 2019
alexis-via pushed a commit to akretion/partner-contact that referenced this pull request Nov 26, 2020
pedrobaeza pushed a commit to Tecnativa/partner-contact that referenced this pull request Dec 15, 2020
pedrobaeza pushed a commit to Tecnativa/partner-contact that referenced this pull request Nov 16, 2021
holdenrehg pushed a commit to holdenrehg/partner-contact that referenced this pull request Nov 27, 2021
holdenrehg pushed a commit to holdenrehg/partner-contact that referenced this pull request Nov 27, 2021
pedrobaeza pushed a commit to Tecnativa/partner-contact that referenced this pull request Oct 18, 2022
victor-champonnois pushed a commit to coopiteasy/partner-contact that referenced this pull request Feb 3, 2023
royaurelien pushed a commit to apikcloud/partner-contact that referenced this pull request Jan 24, 2024
pedrobaeza pushed a commit to Tecnativa/partner-contact that referenced this pull request Feb 29, 2024
edlopen pushed a commit to moduon/partner-contact that referenced this pull request Mar 1, 2024
edlopen pushed a commit to moduon/partner-contact that referenced this pull request Mar 1, 2024
Kimkhoi3010 pushed a commit to Kimkhoi3010/partner-contact that referenced this pull request Oct 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants