いっくよー!!
$ git fetch upstream
$ git merge upstream/feature-request-pool
Auto-merging app/workers/activitypub/delivery_worker.rb
CONFLICT (add/add): Merge conflict in app/lib/request_pool.rb
Auto-merging app/lib/request_pool.rb
Auto-merging Gemfile.lock
Auto-merging Gemfile
Automatic merge failed; fix conflicts and then commit the result.
$ git checkout --theirs app/lib/request_pool.rb
$ git add app/lib/request_pool.rb
$ git commit
$ git push