<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Sanne - you should add this as a warning section to <a href="https://docs.jboss.org/author/display/ISPN/Contributing+-+Source+Control">https://docs.jboss.org/author/display/ISPN/Contributing+-+Source+Control</a> :-)<div><br><div><div>On 18 Oct 2011, at 16:09, Sanne Grinovero wrote:</div><br class="Apple-interchange-newline"><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">infinispan-dev@lists.jboss.org</a><br>https://lists.jboss.org/mailman/listinfo/infinispan-dev<br></div></blockquote></div><br><div apple-content-edited="true">
<div><div>--</div><div>Manik Surtani</div><div><a href="mailto:manik@jboss.org">manik@jboss.org</a></div><div><a href="http://twitter.com/maniksurtani">twitter.com/maniksurtani</a></div><div><br></div><div>Lead, Infinispan</div><div><a href="http://www.infinispan.org">http://www.infinispan.org</a></div><div><br></div></div><br class="Apple-interchange-newline">
</div>
<br></div></body></html>