Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Jan 23, 2024

No documentation exists for Time Off. Forward port this to V 16 and 17, then targeted edits can be made.

Forward-Port-Of: #7301

@robodoo
Copy link
Collaborator

robodoo commented Jan 23, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 23, 2024

@larm-odoo @samueljlieber cherrypicking of pull request #7301 failed.

stdout:

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

stderr:

22:48:22.242966 git.c:463               trace: built-in: git cherry-pick ce15c93be2f94dc9286b9931fd35b47a7205d5c1
error: could not apply ce15c93be... [ADD] Time Off: new documentation needed
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

@samueljlieber samueljlieber self-requested a review January 23, 2024 21:55
@larm-odoo larm-odoo force-pushed the 16.0-15.0-Time-Off-new-doc-larm-_0mN-fw branch from 0453f3b to 99da7d1 Compare January 24, 2024 21:33
@C3POdoo C3POdoo requested review from a team January 24, 2024 21:35
@larm-odoo
Copy link
Contributor

@samueljlieber I think I fixed it and it's good to go! =)

Copy link
Contributor

@samueljlieber samueljlieber left a comment

Choose a reason for hiding this comment

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

Hi @larm-odoo! Thank you for resolving the conflicts here! You have it 90% correct, there were two issues that I explained below.

When resolving merge conflicts on FWPs, its a good idea to open the previous version and FWP version of the doc(s) on GitHub to reference the changes being made in your conflict resolution. 🙂

I will push up a commit after this review to fix these two items, and then complete the merge for the FWPs.

@samueljlieber samueljlieber force-pushed the 16.0-15.0-Time-Off-new-doc-larm-_0mN-fw branch from 99da7d1 to 3aa2f70 Compare January 24, 2024 22:27
@samueljlieber
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.

4 participants