<html dir="ltr">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" id="owaParaStyle"></style><style type="text/css"><!----></style>
</head>
<body fpstyle="1" ocsi="0">
<div style="direction: ltr;font-family: Tahoma;color: #000000;font-size: 10pt;">Hello Aashish,
<div><br>
</div>
<div> 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.</div>
<div><br>
</div>
<div>Regards </div>
<div>Manas Pawar<br>
<div style="font-family: Times New Roman; color: #000000; font-size: 16px">
<hr tabindex="-1">
<div id="divRpF941669" style="direction: ltr;"><font face="Tahoma" size="2" color="#000000"><b>From:</b> Aashish Chaudhary [aashish.chaudhary@kitware.com]<br>
<b>Sent:</b> Saturday, April 20, 2013 9:49 PM<br>
<b>To:</b> Manas Pawar<br>
<b>Cc:</b> opengeoscience-developers<br>
<b>Subject:</b> Re: Conflicts in merging to Master<br>
</font><br>
</div>
<div></div>
<div>
<div dir="ltr">Would it be easier to start from master itself?
<div><br>
</div>
<div style="">- Aashish</div>
<div style=""><br>
</div>
</div>
<div class="gmail_extra"><br>
<br>
<div class="gmail_quote">On Sat, Apr 20, 2013 at 6:55 PM, Manas Pawar <span dir="ltr">
<<a href="mailto:mp3381@students.poly.edu" target="_blank">mp3381@students.poly.edu</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex; border-left:1px #ccc solid; padding-left:1ex">
<div>
<div style="direction:ltr; font-size:10pt; font-family:Tahoma">Hello Aashish,
<div><br>
</div>
<div> 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?</div>
<div><br>
</div>
<div>Regards </div>
<span class="HOEnZb"><font color="#888888">
<div>Manas Pawar</div>
</font></span></div>
</div>
</blockquote>
</div>
<br>
<br clear="all">
<div><br>
</div>
-- <br>
| Aashish Chaudhary <br>
| R&D Engineer <br>
| Kitware Inc. <br>
| <a href="http://www.kitware.com" target="_blank">www.kitware.com</a> </div>
</div>
</div>
</div>
</div>
</body>
</html>