social
social copied to clipboard
[17.0][MIG] mail_optional_follower_notification: Migration to 17.0
Can you rebase? we needed to apply a change on main branch
/ocabot rebase /ocabot migration mail_optional_follower_notification
@hbrunn The rebase process failed, because command git rebase origin/17.0 failed with output:
First, rewinding head to replay your work on top of it...
Applying: [IMP] mail_outbound_static: pre-commit auto fixes
.git/rebase-apply/patch:284: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M mail_outbound_static/README.rst
M mail_outbound_static/models/ir_mail_server.py
A mail_outbound_static/readme/CONTRIBUTORS.rst
A mail_outbound_static/readme/DESCRIPTION.rst
A mail_outbound_static/readme/ROADMAP.rst
A mail_outbound_static/readme/USAGE.rst
M mail_outbound_static/static/description/index.html
M mail_outbound_static/tests/test_ir_mail_server.py
Falling back to patching base and 3-way merge...
Auto-merging mail_outbound_static/static/description/index.html
Auto-merging mail_outbound_static/models/ir_mail_server.py
Auto-merging mail_outbound_static/README.rst
CONFLICT (content): Merge conflict in mail_outbound_static/README.rst
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 [IMP] mail_outbound_static: pre-commit auto fixes
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".
Hey,
I tested it and it does not work. All followers get notified, no matter what.
Superseded by #1381