<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">I've just run the same on master and it fast forwarded smoothly: <a href="http://pastebin.com/p5qs4rQt">http://pastebin.com/p5qs4rQt</a> <div><br><div><div>On 28 Apr 2011, at 13:25, Sanne Grinovero wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Hello,<br>I don't understand what happened; I'm having a clean master locally,<br>if I pull from "upstream master" I get many more changes than<br>expected, and many conflicts as well.<br><br>Looking in the network tab on github it seems that the reference<br>branch was Tristan's, which contains all of people's latest work. It<br>also looks like everyone else in the team didn't push anything to it's<br>own master in the last weeks.<br><a href="https://github.com/infinispan/infinispan/network">https://github.com/infinispan/infinispan/network</a><br><br>after deleting locally two months of history I could merge upstream<br>master; it doesn't look bad and it includes many recent commits, but<br>I'd feel better if we understand what happened.<br><br>Sanne<br>_______________________________________________<br>infinispan-dev mailing list<br>infinispan-dev@lists.jboss.org<br>https://lists.jboss.org/mailman/listinfo/infinispan-dev<br></div></blockquote></div><br></div></body></html>