Re: [openstack-dev] [congress] Jenkins failure

2014-08-19 Thread Tim Hinrichs
Some docs got merged last night. I think that if you fetch the latest and rebase that you’ll end up with conflicts that you need to resolve manually. The Readme file has changed a lot, so I’m sure git doesn’t know how to merge your changes in. Tim On Aug 18, 2014, at 10:21 PM, Rajdeep Dua

Re: [openstack-dev] [congress] Jenkins failure

2014-08-19 Thread Aaron Rosen
You need to rebase again. The readme file changed before Jenkins got a chance to test your patch. On Monday, August 18, 2014, Rajdeep Dua rajdeep@gmail.com wrote: my branch already has the latest changes. it is not able to merge two rst files hence it failed On Tue, Aug 19, 2014 at

Re: [openstack-dev] [congress] Jenkins failure

2014-08-18 Thread Akash Gangil
This change was unable to be automatically merged with the current state of the repository. Please rebase your change and upload a new patchset. Rebase and commit? On Tue, Aug 19, 2014 at 12:10 AM, Rajdeep Dua rajdeep@gmail.com wrote: One of my CL - updation of README.rst seems to be

Re: [openstack-dev] [congress] Jenkins failure

2014-08-18 Thread Rajdeep Dua
my branch already has the latest changes. it is not able to merge two rst files hence it failed On Tue, Aug 19, 2014 at 10:02 AM, Akash Gangil akashg1...@gmail.com wrote: This change was unable to be automatically merged with the current state of the repository. Please rebase your change and