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 perspective. So no harm done in terms of code being lost. The only issue could be that a bit of history being jumbled in terms of parents. Reverting my commits would be more trickier and can be more difficult given the size. I also discussed this with one of my friends explaining him this flow and he backed my findings as well. I had done sanity testing after pushing the code and that worked fine. The doc file (which Hugo pointed to) I had mistakenly added without resolving the conflicts which I will shortly fix. If anyone sees any other issues with this do let me know. >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 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 >>>> >>
