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

[10.0][MIG] product_template (squashed) #271

Merged
merged 4 commits into from
Apr 27, 2018

Conversation

hparfr
Copy link
Contributor

@hparfr hparfr commented Apr 27, 2018

Squashed PR of #266

@pedrobaeza
Copy link
Member

No need of creating a new PR. Check https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests

@bealdav
Copy link
Member

bealdav commented Apr 27, 2018

I think @hparfr want to keep traceability on its work ;-)

@hparfr
Copy link
Contributor Author

hparfr commented Apr 27, 2018

Since the commits where pushed on github, I can't rewrite history of the PR without push -f .
And push forcing is bad 🌵

@pedrobaeza
Copy link
Member

Well, it's not that bad, as you are writing your own branch, not OCA one, but as you prefer.

@bealdav
Copy link
Member

bealdav commented Apr 27, 2018

ready to merge now, thanks @pedrobaeza

@pedrobaeza pedrobaeza merged commit 7a58761 into OCA:10.0 Apr 27, 2018
@bealdav bealdav deleted the 10.0-mig-product_template_squashed branch April 27, 2018 14:20
@pedrobaeza pedrobaeza mentioned this pull request Apr 27, 2018
11 tasks
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.

None yet

5 participants