git - Selectively importing other people's pull requests in your own Github fork -


ok haven't find better way title question. explaining scenario easier. remember this github question, not prototype-js question (please don't add tag me)

the scenario

i'm working on prototype-based web application. found 1.7.1 (no blame author) has few bugs annoying us. these bugs have, fortunately us, publicly available fix through pull request has been accepted master branch.

my boss , discussed choice between patching prototype 1.7.1 each incompatibility find , agreed using "development" version in soon-to-be production application not best choice, our idea patch our version of prototype.

i responsible this. since want track changes company applies prototype (even if i'm who'll touch js file), want in efficient way can left posterity.

github allows fork project own workspace can play as wish. keep track of patches import prototype linking them existing pull requests made original project.

the general question

given generic open source project on github have forked, there way can find pull request, submitted original branch, , choose "import" in own fork (given files should diff-compatible) applied branch?

of course, allows me, on time, keep track record (with comments , discussions) what prs chose import in branch , didn't.

given generic open source project on github have forked, there way can find pull request, submitted original branch, , choose "import" in own fork (given files should diff-compatible) applied branch?

yes. here's how it:

  1. fork repository myaccount/project
  2. clone myaccount/project locally
  3. use git remote add [remote name] each of remotes have fixes want use.
  4. run git fetch --all download everything
  5. use git merge --no-ff -m [remote-name]/[branch-name] merge in changes each pull request want include in fork. --no-ff creates merge commit audit-ability , -m let's specify message in editor (so can include link pull request in merge commit).
  6. once you've made merge, can use git push update fork on github various pull requests you've merged in.

Comments

Post a Comment

Popular posts from this blog

basic authentication with http post params android -

i doing basic authentication passing username , password , using basicnamevaluepair sending post params response service. my method: public stringbuilder callservicehttppost(string username, string password, string type) { // create new httpclient , post header httpclient httpclient = new defaulthttpclient(); httppost httppost = new httppost(webservice + type); httpresponse response = null; stringbuilder total = new stringbuilder(); try { url url = new url(webservice + type); /*string base64encodedcredentials = base64.encodetostring((username + ":" + password).getbytes(), base64.url_safe | base64.no_wrap);*/ string base64encodedcredentials = "basic " + base64.encodetostring( (username + ":" + password).getbytes(), base64.no_wrap); httppost.setheader("auth...
Read more

vb.net - Virtual Keyboard commands -

i wondering difference between virtual these keyboard commands is: keyeventf_extendedkey , keyeventf_keyup is. everywhere have looked gives me description based off integers , not want know each of them does. you've tagged question vb.net, these have nothing @ vb.net. they're constants defined in windows header files, use win32 api functions. as far difference, can't tell looking @ values. individual values not particularly important, that's why named identifiers used. what's important used , documentation functions tells mean. the first one, keyeventf_extendedkey , used keybdinput structure (which used along e.g. sendinput function) pass information synthesized keyboard input. if flag used, means scan code should interpreted extended key. technically, means scan code preceded prefix byte value 224 (&he0 in hexadecimal notation). the second one, keyeventf_keyup , 1 of flags available use structure. means key being released (going up)...
Read more

css - Firefox for ubuntu renders wrong colors -

Image
i've got following problem: i'm developing website, while testing around i've noticed firefox , chromium display css bar in different colors. when switched between several machine come conclusion firefox ubuntu problem. on other devices i've tested website. it's fine. the differences between chrome , firefox rendering: firefox: chromium: note: firefox ubuntu problem. does knows why , came solution? https://bugzilla.mozilla.org/show_bug.cgi?id=655637 bug 629312 - firefox displays wrong colors on image (only linux) open about:config , rechange gfx.color_management.mode 2 0.
Read more