That did it! Thanks! Kersten J. Richter Software Engineer IBM, Rochester Home office: 952-652-5304 If you lend someone $20 and never see that person again, it was probably worth it. From: Diane Fleming <diane.fleming at rackspace.com> To: Kersten J Richter/Rochester/IBM at IBMUS, Cc: "openstack-docs at lists.openstack.org" <openstack-docs at lists.openstack.org> Date: 10/24/2013 02:15 PM Subject: Re: [Openstack-docs] resolving git review conflicts 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> Date: Thursday, October 24, 2013 2:13 PM To: Diane Fleming <diane.fleming at rackspace.com> Cc: "openstack-docs at lists.openstack.org" < 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/9686fa98/attachment.html> -------------- next part -------------- A non-text attachment was scrubbed... Name: graycol.gif Type: image/gif Size: 105 bytes Desc: not available URL: <http://lists.openstack.org/pipermail/openstack-docs/attachments/20131024/9686fa98/attachment.gif>
