Tag and release last updates on repository to pypi

Tag and release last updates on repository to pypi.

At first GPG key pair should be created. Look for previous post about it.

Checkout to required branch:

$ git checkout master

Create signed version tag:

$ git tag -s 0.1.13

Verify tag that was created:

$ git tag -v 0.1.13

Check list of git remotes:

$ git remote
gerrit
origin

Push tag to gerrit remote:

$ git push gerrit 0.1.13

How to resolve a merge conflict?

How to resolve Git merge conflict in workflow using Gerrit?

Example

1. Clone the project Git repository
git clone https://github.com/openstack/python-ironicclient.git
cd python-ironicclient/

2. Create a new local branch for the issue you are working on
git checkout -b bug/1566329

3. Cherry-pick your patch set from Gerrit
git fetch https://git.openstack.org/openstack/python-ironicclient refs/changes/92/365692/11 && git cherry-pick FETCH_HEAD

4. Check git status to see where conflict is
git status

5. Resolve merge conflict using merge tool, IDE or text editor

6. Add changes to the next commit
git add ironicclient/tests/functional/osc/v1/base.py

7. Continue cherry-pick operation
git cherry-pick --continue

8. Push it back to Gerrit
git review