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 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 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 >>
