[asterisk-users] Gerrit usage?

[Daniel Tryba]

I'm trying to figure out how to commit some code for review. Following:
https://wiki.asterisk.org/wiki/display/AST/Gerrit+Usage

Created a ssh alias.
Cloned using: "git clone ssh://asterisk/asterisk"
Set name and email.
Installed the gerrit commit hook: "git review -s"
Try to change to asterisk 13 for creating a patch: "git checkout 13"
This fails with:
error: pathspec '13' did not match any file(s) known to git.


"git checkout -b 13" appears to fix this.

Created a new branch:
git checkout -b ASTERISK-27284

Did some work, added and commited this work. So far so good.

Now trying to submit this: "git review 13"
Fails with:

>Errors running git rebase -p -i remotes/gerrit/13
>error: could not apply 5760526... Update UPGRADE.txt for 13 branch
>
>When you have resolved this problem, run "git rebase --continue".
>If you prefer to skip this patch, run "git rebase --skip" instead.
>To check out the original branch and stop rebasing, run "git rebase
>--abort".
>Could not pick 5760526f69ad02189c8e385e2e974be4cba11b6e
>It is likely that your change has a merge conflict. You may resolve it
>in the working tree now as described above and then run 'git review'
>again, or if you do not want to resolve it yet (note that the change can
>not merge until the conflict is resolved) you may run 'git rebase
>--abort' then 'git review -R' to upload the change without rebasing.


Somehow some way, UPGRADE.txt and UPGRADE-13.txt are changed and I can't
find any way to discard/ignore/remove/skip these changes. Clearly I
don't understand git and the way it handles conflicts it created by
itself.

What is going wrong? What is the magical git command to just commit the
2 files I added/commited for review?