From the time I created the topic branch until the time patchset #2 was approved and getting verified, the file the patch applied to had changed. I got the message from Jenkins to “Please rebase your change and upload a new patchset.”
I have been getting confident submitting patches, receiving reviews, editing my patches and resubmitting but having to rebase my patch and upload a new patchset was new for me.
I looked at some documentation, on our OpenStack workflow and also on git rebase. I decided to go with:
git status #I was on my clean topic branch
git checkout master
git checkout my-topic-branch
git rebase master
This patch only dealt with one file, tools/pip-requires. I consulted with a collegue and was advised to use the following steps which worked:
vi tools/pip-requires #resolve the conflict in the file and save the changes
git add tools/pip-requires && git rebase --continue
This got me the following message, “Applying: Added PyRSS2Gen and python-swiftclient to pip-requires to satisfy the openstackwatch dependency.”
git status was clean
git review submitted the new patchset to gerrit.
An easy addition to the workflow but since it was the first time I had to do it I figured it was worth a quick post.
Thanks for supporting this GNOME OPW intern,