Skip to content

Conversation

@alexis-via
Copy link
Contributor

Convert README to the new readme subdirectory

@alexis-via alexis-via merged commit 741a801 into OCA:12.0 Jul 18, 2019
@sbidoul
Copy link
Member

sbidoul commented Jul 19, 2019

/ocabot merge

@OCA-git-bot
Copy link
Contributor

@sbidoul The merge process could not start, because command git rebase --autosquash 12.0 failed with output:

First, rewinding head to replay your work on top of it...
Applying: Update README for report_py3o and report_py3o_fusion_server
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging report_py3o/readme/ROADMAP.rst
CONFLICT (add/add): Merge conflict in report_py3o/readme/ROADMAP.rst
error: Failed to merge in the changes.
Patch failed at 0001 Update README for report_py3o and report_py3o_fusion_server
Use 'git am --show-current-patch' to see the failed patch

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".


@sbidoul
Copy link
Member

sbidoul commented Jul 19, 2019

@alexis-via the README is broken. Can you try generating it manually to fix the error?

Normally such errors are caught when merging with /ocabot.

lmignon pushed a commit to acsone/reporting-engine that referenced this pull request Nov 19, 2019
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
njeudy pushed a commit to myceliandre/reporting-engine that referenced this pull request Jan 7, 2020
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
elmeriniemela pushed a commit to elmeriniemela/reporting-engine that referenced this pull request Oct 21, 2020
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
alexis-via added a commit to akretion/reporting-engine that referenced this pull request Feb 2, 2021
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
apineux pushed a commit to acsone/reporting-engine that referenced this pull request Jun 29, 2021
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
apineux pushed a commit to acsone/reporting-engine that referenced this pull request Jun 30, 2021
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
leemannd pushed a commit to camptocamp/reporting-engine that referenced this pull request Sep 28, 2021
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
leemannd pushed a commit to camptocamp/reporting-engine that referenced this pull request Dec 9, 2021
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
alexis-via added a commit to akretion/reporting-engine that referenced this pull request Dec 9, 2021
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
phuctranfxvn pushed a commit to phuctranfxvn/reporting-engine that referenced this pull request Dec 22, 2021
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
phuctranfxvn pushed a commit to phuctranfxvn/reporting-engine that referenced this pull request Feb 1, 2022
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
phuctranfxvn pushed a commit to phuctranfxvn/reporting-engine that referenced this pull request May 15, 2022
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
alexis-via added a commit to akretion/reporting-engine that referenced this pull request Dec 12, 2022
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
alexis-via added a commit to akretion/reporting-engine that referenced this pull request Dec 12, 2022
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
Tardo pushed a commit to admingrupoisonores/reporting-engine that referenced this pull request Mar 24, 2023
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
njeudy pushed a commit to Alusage/reporting-engine that referenced this pull request Jun 29, 2023
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
njeudy pushed a commit to Alusage/reporting-engine that referenced this pull request Jun 29, 2023
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
Ricardoalso pushed a commit to camptocamp/reporting-engine that referenced this pull request Sep 8, 2023
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
alexis-via added a commit to akretion/reporting-engine that referenced this pull request Oct 23, 2023
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
alexis-via added a commit to akretion/reporting-engine that referenced this pull request Nov 2, 2023
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
Ricardoalso pushed a commit to camptocamp/reporting-engine that referenced this pull request Nov 20, 2023
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
bealdav pushed a commit to akretion/reporting-engine that referenced this pull request May 31, 2024
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
bealdav pushed a commit to akretion/reporting-engine that referenced this pull request May 31, 2024
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
angelmoya pushed a commit to SidooSL/reporting-engine that referenced this pull request Sep 25, 2024
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
psugne pushed a commit to versada/reporting-engine that referenced this pull request Oct 31, 2024
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
sbejaoui pushed a commit to acsone/reporting-engine that referenced this pull request Feb 11, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
JasminSForgeFlow pushed a commit to ForgeFlow/reporting-engine that referenced this pull request Mar 27, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
Qlasta pushed a commit to versada/reporting-engine that referenced this pull request Apr 15, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
Qlasta pushed a commit to versada/reporting-engine that referenced this pull request Apr 15, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
JordiMForgeFlow pushed a commit to ForgeFlow/reporting-engine that referenced this pull request Apr 23, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
JordiMForgeFlow pushed a commit to ForgeFlow/reporting-engine that referenced this pull request Apr 23, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
sbidoul pushed a commit to acsone/reporting-engine that referenced this pull request Apr 23, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
JasminSForgeFlow pushed a commit to ForgeFlow/reporting-engine that referenced this pull request Apr 23, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
pilarvargas-tecnativa pushed a commit to Tecnativa/reporting-engine that referenced this pull request May 15, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
pilarvargas-tecnativa pushed a commit to Tecnativa/reporting-engine that referenced this pull request May 15, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
em230418 pushed a commit to em230418/reporting-engine that referenced this pull request Sep 26, 2025
* Update README for report_py3o and report_py3o_fusion_server

Convert README to the new readme subdirectory
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