Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.Sign up
SCCP connection establishment and release (with fixes) #251
To clarify, it could be done with following commands:
$ git clone https://github.com/RestComm/jss7.git $ cd jss7 $ git remote add vm https://github.com/vmykhailiuk/jss7.git $ git remote -v origin https://github.com/RestComm/jss7.git (fetch) origin https://github.com/RestComm/jss7.git (push) vm https://github.com/vmykhailiuk/jss7.git (fetch) vm https://github.com/vmykhailiuk/jss7.git (push) $ git fetch vm $ git checkout sccp-conn-establishment-release-fixes-#242 $ git branch -D sccp-co $ git push origin :sccp-co $ git checkout -b sccp-co $ git push origin sccp-co
Of course, checking out repository could be skipped if that was done earlier.
Because of this, those branches can't be merged right now. If those commits were cherry-picked, than new commit also should be cherry-picked.
Commands to load latest changes to sccp-co branch:
referenced this pull request
Jul 21, 2017
yes, previous commits were cherry-picked. And I tried to cherry pick a next your commit that brought me conflicts. I can make new cherry-pick operations if you give me a list of commits to add.
Do you mean it is enouph to add a single commit from you ? I can not find that commit...
Or we can kill that new created "sccp-co" branch and start of working with master branch. In this case your updates needs to have a PR with differenses from master branch (may be like this one). I do not want just to merge branches to avoid of adding of unexpected commits, better to cherry-pick of concrete commits. The problem is - we need to start of code checking from some older point. If you think that your current code is more or less ready I can create a new "sccp-co" branch where we put code and from whicj you will be able to continure your work.
PS: I am using EGIT from eclipse, not just a GIT