<div dir="ltr"><div>Hi Chaffra,</div><div><br></div><div>When you edit a file, the most important thing is keep the style the same as it was before. This means that any code-styling tool like astyle or kwstyle that operates on the entire file will cause problems. You should only apply styling to the blocks of code that you, yourself, have added to the files. That makes git happy, because it can properly track all of the changes and attribute each block of code to the correct person.</div><div><br></div><div>Also, the code must not have any hard tabs or invisible whitespace (extra spaces at the ends of lines, or extra blank lines at the end of files). The reason for this is that any changes to the code must be visible changes. Changing spaces to tabs or vice-versa is an invisible change, so tabs are not allowed.</div><div><br></div><div> - David</div><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Aug 5, 2015 at 3:00 PM, David E DeMarle <span dir="ltr"><<a href="mailto:dave.demarle@kitware.com" target="_blank">dave.demarle@kitware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Please reply all to keep the list in on the discussion, thanks.<div><br></div><div>I've never used either pretty-printer so I can't comment on their merits.<br></div><div><br></div><div><br></div></div><div class="gmail_extra"><span class=""><br clear="all"><div><div>David E DeMarle<br>Kitware, Inc.<br>R&D Engineer<br>21 Corporate Drive<br>Clifton Park, NY 12065-8662<br>Phone: <a href="tel:518-881-4909" value="+15188814909" target="_blank">518-881-4909</a></div></div>
<br></span><div class="gmail_quote">On Wed, Aug 5, 2015 at 4:57 PM, Chaffra Affouda <span dir="ltr"><<a href="mailto:chaffra@gmail.com" target="_blank">chaffra@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div bgcolor="#FFFFFF" text="#000000">
Thanks David,<br>
<br>
Is the more general way to use KWStyle or Astyle?<div><div class="h5"><div><div><br>
<br>
<br>
<br>
<div>On 08/05/2015 04:28 PM, David E DeMarle
wrote:<br>
</div>
<blockquote type="cite">
<div dir="ltr">I've used this a bit with eclipse and it prevents
most of the pedantic problems.
<div><br>
</div>
<div>I'm not an eclipse guru so I can't tell you how to apply it
after the fact off the top of my head.
<div><br>
</div>
</div>
<div>hth</div>
</div>
<div class="gmail_extra"><br clear="all">
<div>
<div>David E DeMarle<br>
Kitware, Inc.<br>
R&D Engineer<br>
21 Corporate Drive<br>
Clifton Park, NY 12065-8662<br>
Phone: <a href="tel:518-881-4909" value="+15188814909" target="_blank">518-881-4909</a></div>
</div>
<br>
<div class="gmail_quote">On Wed, Aug 5, 2015 at 4:13 PM, Chaffra
Affouda <span dir="ltr"><<a href="mailto:chaffra@gmail.com" target="_blank">chaffra@gmail.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
What's the best way to format the code prior to a merge
request? I am using eclipse to format the code but the
kwrobot keeps rejecting the basic content.<br>
<br>
Thanks,<br>
Chaffra<br></blockquote></div></div></blockquote></div></div></div></div></div></blockquote></div></div></blockquote></div><br></div></div>