Github user mitchell852 commented on the issue:
https://github.com/apache/incubator-trafficcontrol/pull/544
I'm ready to merge this PR however it says "This branch cannot be rebased
safely". To be honest I'm not really sure what that means but it doesn't sound
great. So here's what I'd suggest:
1. update your master branch
2. git checkout authorization_model
3. git rebase master
if all goes smoothly:
4. git push origin authorization_model --force (which will update your PR)
if all doesn't go smoothly:
4. resolve conflicts (this is the tricky part of course do a git status to
see where the conflicts are)
5. git rebase --continue (i think. it will tell you on the command line)
6. git push origin authorization_model --force (which will update your PR)
of course if that doesn't work you can always do:
git rebase --abort
and we'll sync up and see what the issue is...
---
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.
---
