[Opengeoscience-developers] Conflicts in merging to Master

[Aashish Chaudhary]

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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/opengeoscience-developers/attachments/20130420/62c593d4/attachment.html>