[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: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Hello Josef, On Thu, 2020-09-24 at 12:24 +0200, josef Reidinger wrote:
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.
Did a quick search on the Internet because I recollected that Github had made this a bit easier for maintainers. Found a SO post: https://stackoverflow.com/questions/44030176/how-to-modify-someone-elses-git... and from there, the Github blog post which explains the feature: https://github.blog/2016-09-07-improving-collaboration-with-forks/ At least, all of my PRs have the "Allow edits from maintainers" option enabled. :-) I'm sorry, I don't have a better solution for you! Regards, Srinidhi.
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
participants (3)
-
Ioannis Bonatakis -
josef Reidinger -
Srinidhi B