[Openstack-docs] resolving git review conflicts

Diane Fleming diane.fleming at RACKSPACE.COM
Thu Oct 24 19:15:41 UTC 2013


Look at this file to see if it has merge conflicts:

openstack-object-storage-dev/ch_object-api-general.xml

If it does, resolve them and then

git add .
git rebase —continue

git review –v


Diane
----------------------------------------------
Diane Fleming
Software Developer II - US
diane.fleming at rackspace.com
Cell  512.323.6799
Office 512.874.1260
Skype drfleming0227
Google-plus diane.fleming at gmail.com

From: Kersten J Richter <kersten at us.ibm.com<mailto:kersten at us.ibm.com>>
Date: Thursday, October 24, 2013 2:13 PM
To: Diane Fleming <diane.fleming at rackspace.com<mailto:diane.fleming at rackspace.com>>
Cc: "openstack-docs at lists.openstack.org<mailto:openstack-docs at lists.openstack.org>" <openstack-docs at lists.openstack.org<mailto:openstack-docs at lists.openstack.org>>
Subject: Re: [Openstack-docs] resolving git review conflicts

openstack-object-storage-dev/ch_object-api-general.xml
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-docs/attachments/20131024/491cbcd2/attachment.html>


More information about the Openstack-docs mailing list