[Opengeoscience-developers] Conflicts in merging to Master

[Aashish Chaudhary]

Sure..it would be awesome to get it done so that we can move forward.

Thank you so much for taking care of this.

- Aashish'


On Sun, Apr 21, 2013 at 11:48 AM, Manas Pawar <mp3381 at students.poly.edu>wrote:

>  Hello Aashish,
>
>    Sorry could not reply earlier. There are ten conflicting files. I
> guess it will take around 2 hours. Keval and I will split the work and
> finish it asap.
>
>  Regards
> Manas Pawar
>  ------------------------------
> *From:* Aashish Chaudhary [aashish.chaudhary at kitware.com]
> *Sent:* Saturday, April 20, 2013 9:49 PM
> *To:* Manas Pawar
> *Cc:* opengeoscience-developers
> *Subject:* Re: Conflicts in merging to Master
>
>   Would it be easier to start from master itself?
>
>  - Aashish
>
>
>
> On Sat, Apr 20, 2013 at 6:55 PM, Manas Pawar <mp3381 at students.poly.edu>wrote:
>
>>  Hello Aashish,
>>
>>   While merging fix-jslint to the latest Master branch, some of the
>> files are conflicting. I have attached the screenshot. So the merge is not
>> taking place. What do u suggest, Should I do a JsLint on the conflicting
>> files and merge? or do we have some other option?
>>
>>  Regards
>>  Manas Pawar
>>
>
>
>
>  --
> | Aashish Chaudhary
> | R&D Engineer
> | Kitware Inc.
> | www.kitware.com
>



-- 
| Aashish Chaudhary
| R&D Engineer
| Kitware Inc.
| www.kitware.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/opengeoscience-developers/attachments/20130421/64bd06dc/attachment.html>