+1<div>ROFL!</div><div><br></div><div>--Kevin<br><br><div class="gmail_quote">On 27 October 2011 14:22, Manik Surtani <span dir="ltr"><<a href="mailto:manik@jboss.org">manik@jboss.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
<div style="word-wrap:break-word">Sanne - you should add this as a warning section to <a href="https://docs.jboss.org/author/display/ISPN/Contributing+-+Source+Control" target="_blank">https://docs.jboss.org/author/display/ISPN/Contributing+-+Source+Control</a> :-)<div>
<div><div></div><div class="h5"><br><div><div>On 18 Oct 2011, at 16:09, Sanne Grinovero wrote:</div><br><blockquote type="cite"><div>1) If you have warnings about "Merge made by recursive" you have to<br>fix it rebasing.<br>
<br>2) If you have warnings about "non-fast-forward" you have to rebase.<br><br>3) If you see "non-fast-forward updates were rejected" you shall never<br>use "force" on upstream! It means that another patch was merged before<br>
you and you have to update your master again, and rebase again.<br><br>4) "force" is allowed only in special maintenance circumstances. If<br>you find you're needing it to handle a pull request, then you're doing<br>
it wrong, and the mistake might be a dangerous one. It's like the good<br>rule of never commit when you're drunk (coding is allowed).<br>_______________________________________________<br>infinispan-dev mailing list<br>
<a href="mailto:infinispan-dev@lists.jboss.org" target="_blank">infinispan-dev@lists.jboss.org</a><br><a href="https://lists.jboss.org/mailman/listinfo/infinispan-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/infinispan-dev</a><br>
</div></blockquote></div><br></div></div><div class="im"><div>
<div><div>--</div><div>Manik Surtani</div><div><a href="mailto:manik@jboss.org" target="_blank">manik@jboss.org</a></div><div><a href="http://twitter.com/maniksurtani" target="_blank">twitter.com/maniksurtani</a></div><div>
<br></div><div>Lead, Infinispan</div><div><a href="http://www.infinispan.org" target="_blank">http://www.infinispan.org</a></div><div><br></div></div><br>
</div>
<br></div></div></div><br>_______________________________________________<br>
infinispan-dev mailing list<br>
<a href="mailto:infinispan-dev@lists.jboss.org">infinispan-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/infinispan-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/infinispan-dev</a><br></blockquote></div><br></div>