I am working on a Murano Pep8/H405 docstring bug. I cloned the Murano repo on April 12, pushed the changes to Gerrit about a week later. The reviewer didn't like on word in my commit message, so I used Gerrit's Edit functionality to update the message. That 2nd patch set triggered triggered a Merge Conflict. A different reviewer said I must have used a very old branch (not) and that I should obtain the code from the master (thought I had done that on 4/12 - I don't even know how to clone a branch instead of the master). I changed probably 30 or so files, most with multiple changes.
How do I deal with a Merge Conflict in Gerrit?
I am working on a Murano Pep8/H405 docstring bug. I cloned the Murano repo on April 12, pushed the changes to Gerrit about a week later. The reviewer didn't like on word in my commit message, so I used Gerrit's Edit functionality to update the message. That 2nd patch set triggered triggered a Merge Conflict. A different reviewer said I must have used a very old branch (not) and that I should obtain the code from the master (thought I had done that on 4/12 - I don't even know how to clone a branch instead of the master). I changed probably 30 or so files, most with multiple changes.
How do I deal with a Merge Conflict in Gerrit?