i think git-cherry-pick should be your friend here add the fork in the remote and fetch their changes. Then create a new branch with the commits you want to adapt
________________________________________ From: josef Reidinger firstname.lastname@example.org Sent: 24 September 2020 12:24 To: YaST-devel Subject: [yast-devel] Hint: Easy adapting changes from forks
Hi, as I now work on merging various pull requests, it often lives in own forks, where I do not have permissions and I am looking for the easiest way to make them again mergeable and sometimes adapt it to our needs.
what works best for me is e.g. for this pr: https://github.com/yast/yast-ruby-bindings/pull/239
```shell git checkout master && git pull && git checkout -b my_branch wget https://github.com/yast/yast-ruby-bindings/pull/239.patch # notice .patch suffix git am -3 239.patch # and then solve conflicts and branch is ready for new pr ```
Do you know easier way? This way it is for me like good old kernel mailing lists where you get set of patches that you can apply. Josef -- To unsubscribe, e-mail: email@example.com To contact the owner, e-mail: firstname.lastname@example.org