search for: keepclass

On 24/01/2018 6:35 PM, G?bor Cs?rdi wrote: > When you create a branch for your bug fix, don't create it off the > previous fix. Create it off the original, forked state of the repo. Branches keepclass2 through to keepclass5 are my attempts to do that. As far as I can see they are all the same as keepclass, which was branched from the head of the master branch of my fork. > > Are the two commits here your fixes? > https://github.com/dmurdoch/manipulateWidget/commits/master Those are...

.../2018 7:04 PM, G?bor Cs?rdi wrote: > You need to create a branch from the original master, if you do > git log master > then you'll see which commit that is: f735449d679686867e7d3ab70810b09e8cea6366 > > So create that branch off that and switch to the new branch: > git branch keepclassx f735449d679686867e7d3ab70810b09e8cea6366 > git checkout keepclassx > > Then do > git log keepclass > to see the id of the new commit that you want to put on top of the new > branch: 0307ccfaa799c5257258eda89f2526347099f0d0 > and cherry-pick that: > git cherry-pick 0307ccfa...

You need to create a branch from the original master, if you do git log master then you'll see which commit that is: f735449d679686867e7d3ab70810b09e8cea6366 So create that branch off that and switch to the new branch: git branch keepclassx f735449d679686867e7d3ab70810b09e8cea6366 git checkout keepclassx Then do git log keepclass to see the id of the new commit that you want to put on top of the new branch: 0307ccfaa799c5257258eda89f2526347099f0d0 and cherry-pick that: git cherry-pick 0307ccfaa799c5257258eda89f2526347099f0d0 Now yo...

...uld be >> >> svn diff -r PREV:HEAD --internal-diff > patchfile >> >> and then the patchfile could be sent to the maintainer. > > If you just want the diff corresponding to the last commit, > > git show > > will print it for you. Or > > git show keepclass > > for a specific branch. But that's only half the battle. If I did that and emailed the diff to a maintainer, I'm guessing I'd be told I should put together a PR instead. And as I found out, that's not easy, if I already have a fork of the repository that contains cha...

Lately I've been doing some work with the manipulateWidget package, which lives on Github at https://github.com/rte-antares-rpackage/manipulateWidget/. Last week I found a bug, so being a good community member, I put together a patch. Since the package lives on Github, I followed instructions to put together a "pull request": - I forked the main branch to my own Github account