Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 30, 2023

Adding a new document and section to HR. No fleet documentation currently exists.

Forward-Port-Of: #5759

@robodoo
Copy link
Collaborator

robodoo commented Dec 30, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 30, 2023

@larm-odoo @StraubCreative cherrypicking of pull request #5759 failed.

stdout:

Auto-merging content/applications/hr/employees/new_employee.rst
CONFLICT (content): Merge conflict in content/applications/hr/employees/new_employee.rst

stderr:

01:47:13.320671 git.c:463               trace: built-in: git cherry-pick de5d3825c6fdf14b56691d5c8be79f7528d60be7
error: could not apply de5d3825c... [ADD] fleet: add a new vehicle
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

X-original-commit: e3d4c2f
Co-authored-by: jero-odoo <[email protected]>
@samueljlieber samueljlieber force-pushed the 16.0-15.0-fleet-add-new-vehicle-larm-xTHw-fw branch from 8ce221a to f54a617 Compare January 2, 2024 13:53
@samueljlieber
Copy link
Contributor

Fixed conflict in new_employee.rst in f54a617

@C3POdoo C3POdoo requested review from a team January 2, 2024 13:55
@samueljlieber samueljlieber removed request for a team January 2, 2024 14:03
@StraubCreative StraubCreative force-pushed the 16.0-15.0-fleet-add-new-vehicle-larm-xTHw-fw branch 2 times, most recently from 98b1f60 to f54a617 Compare January 2, 2024 17:49
@StraubCreative
Copy link
Contributor

@robodoo r+

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants