Re: [reSIProcate] Problem while installing resiprocate
On 10/05/16 02:57, Mateus Bellomo wrote:
> Daniel,
>
> Sorry for the delay to made the commit. I'm having a little trouble to
> do the pull request.
>
> I have a fork [1] and I pushed the changes there. Then when I click at
> 'create pull request' it is mixed with an old pull request that I did
> (changing the build/debian.sh to check from where it is running). And
> I'm not finding any place to separate this 2 things.
>
>
> [1] https://github.com/MateusBellomo/resiprocate
Thanks for trying to work this out, here is the way to undo that and
submit the pull request:
- create a branch starting from the last commit before you changed
anything, e.g.
"git log" to see the history, note down the commit ID of the change
you want (let's say it is def456... for example) and the last commit
before your changes (abc123...... for example)
git branch mateus-reTurn-ssl-fix abc123......
- check out the new branch
git checkout mateus-reTurn-ssl-fix
- cherry-pick your fix onto that branch:
git cherry-pick def456...
- now push your new branch to Github:
git push -u origin mateus-reTurn-ssl-fix
- now go and look in Github and create a pull request from the commit on
the branch
- you mentioned another commit, if you want to keep that, you should
create a branch for it too and cherry-pick it onto that branch using the
same steps
- once you did that, you can also remove the commits from your copy of
the master branch:
git checkout master
git reset HEAD~1
(reverts the last commit from current branch, do this for each of them,
beware that they will be lost if you haven't cherry picked them to
another branch though)
Note you should not normally use the "git reset" command on commits that
you already pushed to Github but in this case, as you have just started
on it, it is OK, you will need to do this to fix your master on Github:
git checkout master
git push -f origin master
Whenever you make changes in any project from Github, I would recommend
starting your work in a branch, e.g. as soon as you clone the project,
do something like this:
git branch mateus-fix-bug-123
git checkout mateus-fix-bug-123
git push -u origin mateus-fix-bug-123
When there are new changes in master, you can get them like this:
git checkout master
git pull https://github.com/resiprocate/resiprocate
and then merge them into the branches where you work:
git checkout mateus-fix-bug-123
git merge master
git push
Regards,
Daniel
Regards,
Daniel