I did checkout to branch branch1 in origin, and after that i edited the file a.file by adding line to this file. After that, I did git add to this file, and then git commit -s.
Then i did git status to check what i get, and I got the following message:
On branch branch1
Your branch is ahead of 'origin/branch1' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
And then I tried to do git-review in order to upload the commit to the remote-repository.
But, after that I did git-review I got the following message:
Error running git rebase --rebase-merges -i remotes/gerrit/master
Rebasing (1/4)
Rebasing (2/4)
Rebasing (3/4)
Auto-merging a.file
CONFLICT (content): Merge conflict in a.file
...
...
Wיhat is in fact the problem and how can I fix that problem so that I will upload this commit on the origin branch (and not about "Topic" with the name of the origin-branch name) ?