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

[FW][ADD] referrals: moving share jobs section to new doc #9425

Closed

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented May 17, 2024

Moving the 'Share Jobs' section to its own doc since it can stand alone- the main doc is too long. This is to help cut up the doc into more digestible parts.

Project Task Card.

Forward-Port-Of: #9319

@robodoo
Copy link
Collaborator

robodoo commented May 17, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented May 17, 2024

@larm-odoo cherrypicking of pull request #9319 failed.

stdout:

Auto-merging content/applications/hr/referrals.rst
CONFLICT (content): Merge conflict in content/applications/hr/referrals.rst
CONFLICT (modify/delete): content/applications/hr/referrals/jobs.png deleted in 264221d82 ([ADD] referrals: moving share jobs section to new doc) and modified in HEAD.  Version HEAD of content/applications/hr/referrals/jobs.png left in tree.
CONFLICT (modify/delete): content/applications/hr/referrals/share.png deleted in 264221d82 ([ADD] referrals: moving share jobs section to new doc) and modified in HEAD.  Version HEAD of content/applications/hr/referrals/share.png left in tree.

stderr:

01:02:11.496101 git.c:463               trace: built-in: git cherry-pick 264221d82b94792b3a7b5799a16ed28bf79576ea
error: could not apply 264221d82... [ADD] referrals: moving share jobs section to new doc
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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

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

@larm-odoo larm-odoo force-pushed the 17.0-15.0-making-new-share-jobs-doc-larm-OEpx-fw branch from 873dac3 to 2c54943 Compare May 23, 2024 19:11
@C3POdoo C3POdoo requested review from a team May 23, 2024 19:12
@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.

None yet

4 participants