Github user jpeach commented on the pull request:
https://github.com/apache/trafficserver/pull/359#issuecomment-163112743
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.
---
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 infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
