I hope the offer by some of you to support people like me who Git appears to hate with a fervor still stands? ;-)
And I volunteer to enhance our documentation if it appears useful. Usecase: I've got a patch approved and pushed to HEAD, and approved for active release branches - 13a46321516e2efd3bbb1f1899c539c6724240a9 . Now I want to backport from HEAD to the GCC 10 tree, so checked out a copy, found git cherry-pick, and gave it a try: git cherry-pick 13a46321516e2efd3bbb1f1899c539c6724240a9 Auto-merging gcc/ChangeLog CONFLICT (content): Merge conflict in gcc/ChangeLog error: could not apply 13a46321516... i386: Define __ILP32__ and _ILP32 for all 32-bit targets 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' What now? I can manually fix up gcc/ChangeLog, but `git diff` then shows a fairly big diff (essentially all changes since the one I am trying to cherry pick)? So ... is git cherry-pick even the right tool? And if so, how do I best go about conflicts happening as part of that, ChangeLog or otherwise? Thanks, Gerald
