Merge in Pull-Request on github freenas-plugins Repository
I submitted a pull request on the github freenas-plugins repository https://github.com/freenas/freenas-plugins/pull/5
I just wanted to make sure it got the attention of someone.
#6 Updated by Jordan Hubbard almost 6 years ago
Wow guys, no wonder we have trouble attracting external contributors with that kind of "can't do" attitude. :)
I'm a total git newb, myself, it seems pretty straight forward to add "git://github.com/josh4trunks/freenas-plugins.git" as a remote or simply pull it, which I did since his branch didn't seem particularly bad, though I suppose if I had been more clever I would have simply added his branch as a branch in our own upstream repo. I can still do that if his branch breaks things in master. What do you think, Joshua? Branch or just move forward and clean up our own rather weak freenas-plugins master branch by importing your stuff?
#8 Updated by Joshua Ruehlig almost 6 years ago
I'd prefer my changes for plex get merged in so that future updates built by others include my changes. As for the added plugins you can keep them in a separate branch but I think that might just complicate things. It's probably best to just keep everything in a single master branch so were all building off the same source.
I plan on contributing some more changes in the near future so hopefully we can get a system to allow easy merging. Specifically I plan on making a bunch of changes to the transmission plugin and also converting the tweakrcconf system to use sysrc instead.
#10 Updated by William Grzybowski almost 6 years ago
git remote add github https://github.com/freenas/freenas-plugins.git
You will need this in your .git/config:
fetch = +refs/pull/*/head:refs/remotes/origin/pr/*
Add it to your existing [remote "origin"]
git fetch github
git merge origin/pr/5
#15 Updated by Joshua Ruehlig almost 6 years ago
Looking at https://github.com/freenas/freenas-plugins, it looks like Jordan merged in my changes + my alternate tree.
So, looks like this bug can be closed!
- close the mentioned PR on github
- fork freenas/freenas-plugins
- work on my fork
- submit Pull Requests and a Bug Report here whenever I feel necessary