Merge conflict

[fkantelberg]

No description provided.

[sbidoul]

/ocabot merge

[sbidoul]

/ocabot merge

[sbidoul]

Command ['git', 'rebase', '--autosquash', '12.0'] failed with output:
b'First, rewinding head to replay your work on top of it...\nApplying: Merge conflict\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging odoo_module/manifest.py\nCONFLICT (add/add): Merge conflict in odoo_module/manifest.py\nPatch failed at 0001 Merge conflict\n\nResolve all conflicts manually, mark them as resolved with\n"git add/rm <conflicted_files>", then run "git rebase --continue".\nYou can instead skip this commit: run "git rebase --skip".\nTo abort and get back to the state before "git rebase", run "git rebase --abort".\n\n'

[sbidoul]

/ocabot merge

[sbidoul]

Command ['git', 'rebase', '--autosquash', '12.0'] failed with output:

b'First, rewinding head to replay your work on top of it...\nApplying: Merge conflict\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nAuto-merging odoo_module/__manifest__.py\nCONFLICT (add/add): Merge conflict in odoo_module/__manifest__.py\nPatch failed at 0001 Merge conflict\n\nResolve all conflicts manually, mark them as resolved with\n"git add/rm <conflicted_files>", then run "git rebase --continue".\nYou can instead skip this commit: run "git rebase --skip".\nTo abort and get back to the state before "git rebase", run "git rebase --abort".\n\n'

[sbidoul]

/ocabot merge

[sbidoul]

Command ['git', 'rebase', '--autosquash', '12.0'] failed with output:

None

[sbidoul]

/ocabot merge

[sbidoul]

/ocabot merge

[sbidoul]

Command ['git', 'rebase', '--autosquash', '12.0'] failed with output:

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

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]

/ocabot merge

[sbidoul]

Command git rebase --autosquash 12.0 failed with output:

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

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]

Command git rebase --autosquash 12.0 failed with output:

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

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".

[acsone-git-bot]

/ocabot merge

[sbidoul]

@acsone-git-bot The merge process could not start, because command git checkout 12.0-ocabot-merge-pr-5-by-acsone-git-bot-bump-no failed with output:

odoo_module/__manifest__.py: needs merge

[acsone-git-bot]

/ocabot merge

[sbidoul]

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

First, rewinding head to replay your work on top of it...
Applying: Merge conflict
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging odoo_module/__manifest__.py
CONFLICT (add/add): Merge conflict in odoo_module/__manifest__.py
Auto-merging odoo_module/__init__.py
Patch failed at 0001 Merge conflict

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".