At $dayjob we maintain internal forks of the a number of upstream repositories.
Unsurprisingly updating these forks can be extremely problematic, especially when it's only one person doing the merge. Fortunately most of us are in the same physical location so it is possible to drag in someone who knows more about the code than the person merging but I can't see that scaling with remote developers.
Is there any way where we could share the conflict resolution around but still end up with a single merge commit. I'm thinking of something like the following workflow
git merge $upstream
git mergetool ...
git commit -m "WIP: Merge upstream" --something-like--all-but-not
git pull developer_A
git reset HEAD^
Any thoughts on if something like this is currently possible? Is this something other git users would find useful?