Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 18, 2024

For context see #8582

Forward-Port-Of: #8748

@robodoo
Copy link
Collaborator

robodoo commented Apr 18, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 18, 2024

@aj-fuentes @Feyensv cherrypicking of pull request #8748 failed.

stderr:

15:25:46.936096 git.c:463               trace: built-in: git cherry-pick 05499f091105480bd689e3e844bc62382f5fef90
error: Cherry-picking is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: cherry-pick failed
----------
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

aj-fuentes and others added 2 commits April 18, 2024 16:10
Add direct code documentation from upgrade-util repo.
Adapt `extensions/github_link`.

Original commit: 3352d33

Co-authored-by: Victor Feyens <vfe@odoo.com>
* Add autodoc directives to generate documentation directly from
  upgrade-util repo.
* Group all upgrades-related reference documentation into one group in
  the sidebar, instead of having two entries.
* Mention `upgrades` vs `migrations` directory. It has been supported
  since a while but nothing was explicit in the documentation.

Original commit: 91a48bf
@Feyensv Feyensv force-pushed the 17.0-16.0-upgrade_util_docs-afu-T1DR-fw branch from 76a7e10 to 78d1b40 Compare April 18, 2024 14:15
@C3POdoo C3POdoo requested a review from a team April 18, 2024 14:22
@Feyensv
Copy link
Collaborator

Feyensv commented Apr 18, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 18, 2024
Add direct code documentation from upgrade-util repo.
Adapt `extensions/github_link`.

Original commit: 3352d33

Part-of: #8836
Co-authored-by: Victor Feyens <vfe@odoo.com>
@robodoo robodoo closed this in ef4b5f8 Apr 18, 2024
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