Open Stack

Hi Bernd,

I'm in Vancouver but I'll try to help anyway ;)

Le 2015-05-20 04:29, Bernd Bausch a écrit :
> Hi. Is there anybody not in Vancouver?
> 
> My patch [1] is still not production-ready, but I would like to upload 
> an
> intermediate result to Gerrit. Since others are working with
> openstack-manuals, I am getting this error:
> 
> 	$ git review
> 	Errors running git rebase -p -i remotes/gerrit/master
> 	fatal: Commit 094a04b15ce073223ee34717e8c991a2e54ff60b is a merge
> but no -m option was given.
> 	Could not pick 094a04b15ce073223ee34717e8c991a2e54ff60b
> 
> I could try "git review -m", but I am afraid of possible undesirable
> consequences that I don't understand due to my mediocre knowledge of 
> git.

I usually use 'git review -d REVIEW_ID' to get gerrit reviews. 'git 
review' should handle the update of a local branch if needed.

Let me know if this works for you.

Gauvain

> 
> Any advice?
> 
> Bernd
> 
> [1] https://review.openstack.org/#/c/180503/ if you are really 
> interested.
> 
> 
> _______________________________________________
> OpenStack-docs mailing list
> OpenStack-docs at lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-docs

Gauvain Pocentek

Objectif Libre - Infrastructure et Formations Linux
http://www.objectif-libre.com