Gerrit

Howto / tutorial to interact with Gerrit

Gerrit/resolve conflict