CONFLICT (content): Merge conflict in sys/sys/copyright.h
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 18247 and retry the command.
error: could not apply c3e89a30fdc... copyrights: Happy New Year 2021
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
--------------
% git status
On branch stable/11
Your branch is up to date with 'origin/stable/11'.
You are currently cherry-picking commit c3e89a30fdc.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --skip" to skip this patch)
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified: COPYRIGHT
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: sys/sys/copyright.h
% git cherry-pick --continue
U sys/sys/copyright.h
error: Committing 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: Exiting because of an unresolved conflict.
# In both cases, reverting the $FreeBSD$ ID was missing, although I edited them locally. Should I have done a 'git commit' on my stable/* branches first?