Nitin,
Can you please fix your commit with id 8d53b1ef05a45604d76b2cf80094f688edf15b44
You committed a file with conflicts (docs/en-US/gslb.xml) and it's breaking the
docs build.
Cheers,
Hugo
Sure. Looking into it.
On 13/05/13 8:14 PM, Hugo Trippaers htrippa...@schubergphilis.com
wrote:
Nitin,
Can you please fix your commit with id
8d53b1ef05a45604d76b2cf80094f688edf15b44
You committed a file with conflicts (docs/en-US/gslb.xml) and it's
breaking the docs build.
Cheers,
Hugo
Speaking of, I saw lots of stuff in that merge that didn't appear to
be related to your merge. I am concerned that it effectively reverted
a number of things.
--David
On Mon, May 13, 2013 at 11:07 AM, Nitin Mehta nitin.me...@citrix.com wrote:
Sure. Looking into it.
On 13/05/13 8:14 PM, Hugo
David - It seems like I messed up my merge here. It wasn't done as a
single commit and therefore the difficulty of reverting it back.
Would you have any suggestions to revert it here ?
On 13/05/13 8:52 PM, David Nalley da...@gnsa.us wrote:
Speaking of, I saw lots of stuff in that merge that
On Mon, May 13, 2013 at 03:54:51PM +, Nitin Mehta wrote:
David - It seems like I messed up my merge here. It wasn't done as a
single commit and therefore the difficulty of reverting it back.
Would you have any suggestions to revert it here ?
AFAIK, you need to go through and revert all
-Original Message-
From: Chip Childers [mailto:chip.child...@sungard.com]
Sent: Monday, May 13, 2013 6:07 PM
To: dev@cloudstack.apache.org
Cc: ni...@apache.org
Subject: Re: Commit 8d53b1ef05a45604d76b2cf80094f688edf15b44
On Mon, May 13, 2013 at 03:54:51PM +, Nitin Mehta
Hi Nitin:
Go through and see what changed that you didn't intend - and revert
those individual commits.
I'd like to understand what happened though - did you rebase your
branch before the merge??
--David
On Mon, May 13, 2013 at 11:54 AM, Nitin Mehta nitin.me...@citrix.com wrote:
David - It
David - I followed the following flow below. I had done the same earlier
as well except that I had squashed the changes into 1 commit.
git checkout -b develop
...make some changes...
...notice master has been updated...
...commit changes to develop...
git checkout master
git pull
...bring those
On 13/05/13 9:48 PM, David Nalley da...@gnsa.us wrote:
Hi Nitin:
Go through and see what changed that you didn't intend - and revert
those individual commits.
David - I googled a bit more and read on this. From my reading it seems
that the flow I followed doesn't harm the branch from code
