Github user jrushf1239k commented on the pull request:
https://github.com/apache/trafficserver/pull/359#issuecomment-163386805
Done, Thanks for the git help!
Thanks
--
John J. Rushford
IPCDN Engineering
1400 Wewatta Street, Denver Colorado 80202
[email protected]
From: James Peach
<[email protected]<mailto:[email protected]>>
Reply-To: apache/trafficserver
<[email protected]<mailto:[email protected]>>
Date: Tuesday, December 8, 2015 at 10:21 PM
To: apache/trafficserver
<[email protected]<mailto:[email protected]>>
Cc: John Rushford
<[email protected]<mailto:[email protected]>>
Subject: Re: [trafficserver] TS-3418: Second hash ring for consistently
hashed parent selection (#359)
We are almost there. To get the commits in the right order we can squash
commit 3 into commit 1 and remove the accidental changes to
lib/tsconfig/TsConfigSyntax.c. On your branch is would be something like this:
$ git fetch --all
$ git rebase -i origin/master
$ # in the interactive rebase move commit 3 into 2nd place and change
'pick' to 'squash'
Now the commits are in the right order and squashed. We can get rid of the
accidental changes now:
$ git rebase -i origin/master
$ # in the interactive rebase change 'pick' to 'edit' for commit 1
$ # now you are paused in the middle of the rebase
$ git show lib/tsconfig/TsConfigSyntax.c | patch -p1 -R
$ git commit -a --amend
$ git rebase --continue
And force push the result.
-
Reply to this email directly or view it on
GitHub<https://github.com/apache/trafficserver/pull/359#issuecomment-163112743>.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
