Skip to content

Conversation

@jcs-odoo
Copy link
Contributor

@jcs-odoo jcs-odoo commented Oct 8, 2021

@jcs-odoo jcs-odoo added this to the 13.0 milestone Oct 8, 2021
@jcs-odoo jcs-odoo requested a review from a team October 8, 2021 11:41
@robodoo
Copy link
Collaborator

robodoo commented Oct 8, 2021

@jcs-odoo jcs-odoo marked this pull request as draft October 8, 2021 11:46
@jcs-odoo jcs-odoo removed the request for review from a team October 8, 2021 11:46
@jcs-odoo jcs-odoo force-pushed the 13.0-upgrade-jcs branch 2 times, most recently from f068903 to edb4810 Compare October 8, 2021 14:36
@jcs-odoo jcs-odoo marked this pull request as ready for review October 8, 2021 14:37
@jcs-odoo jcs-odoo requested a review from a team October 8, 2021 14:37
Copy link
Collaborator

@AntoineVDV AntoineVDV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing redirect!

@jcs-odoo jcs-odoo force-pushed the 13.0-upgrade-jcs branch 2 times, most recently from 63352f3 to 08fd22f Compare October 12, 2021 13:16
@jcs-odoo jcs-odoo requested a review from AntoineVDV October 12, 2021 13:20
Copy link
Collaborator

@AntoineVDV AntoineVDV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Clean work 👍

@jcs-odoo jcs-odoo requested a review from AntoineVDV October 14, 2021 11:08
@jcs-odoo
Copy link
Contributor Author

Clean work 👍

muchas gracias

Copy link
Collaborator

@AntoineVDV AntoineVDV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robodoo
Copy link
Collaborator

robodoo commented Oct 15, 2021

Because this PR has multiple commits, I need to know how to merge it:

  • merge to merge directly, using the PR as merge commit message
  • rebase-merge to rebase and merge, using the PR as merge commit message
  • rebase-ff to rebase and fast-forward

@jcs-odoo
Copy link
Contributor Author

@robodoo rebase-ff

@robodoo
Copy link
Collaborator

robodoo commented Oct 15, 2021

I'm sorry, @jcs-odoo. You can't method=rebase-ff.

@AntoineVDV
Copy link
Collaborator

@robodoo rebase-ff

robodoo pushed a commit that referenced this pull request Oct 15, 2021
robodoo pushed a commit that referenced this pull request Oct 15, 2021
robodoo pushed a commit that referenced this pull request Oct 15, 2021
closes #1169

Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
@robodoo
Copy link
Collaborator

robodoo commented Oct 15, 2021

Merge method set to rebase and fast-forward

@robodoo robodoo closed this Oct 15, 2021
@robodoo robodoo temporarily deployed to merge October 15, 2021 11:25 Inactive
@fw-bot fw-bot deleted the 13.0-upgrade-jcs branch October 29, 2021 11:46
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.

3 participants