Conversation

Notices

1. Embed this notice
   Haelwenn /элвэн/ :triskell: (lanodan@queer.hacktivis.me)'s status on Monday, 23-Sep-2024 00:46:48 JST Haelwenn /элвэн/ :triskell:

   in reply to

   • anna

   @navi Probably need to rebase the PR if you don't want a merge commit, which you can do locally. Something like:

   git checkout -b $remote_branch tmp_pr git rebase master git checkout master git merge --ff tmp_pr
   • Embed this notice
     anna (navi@social.vlhl.dev)'s status on Monday, 23-Sep-2024 00:46:49 JST anna
     i'm trying to pull a PR on top of current master, and i can't figure out how to pull the remote branch on top of the changes that happened to master since then
     
     it either wants to do a merge commit, or rebase master on top of it, not the other way
     
     uh, getting a patch from gh was easier tbh