[infinispan-dev] history on master

[Mircea Markus]

I've just run the same on master and it fast forwarded smoothly: http://pastebin.com/p5qs4rQt 

On 28 Apr 2011, at 13:25, Sanne Grinovero wrote:

> Hello,
> I don't understand what happened; I'm having a clean master locally,
> if I pull from "upstream master" I get many more changes than
> expected, and many conflicts as well.
> 
> Looking in the network tab on github it seems that the reference
> branch was Tristan's, which contains all of people's latest work. It
> also looks like everyone else in the team didn't push anything to it's
> own master in the last weeks.
> https://github.com/infinispan/infinispan/network
> 
> after deleting locally two months of history I could merge upstream
> master; it doesn't look bad and it includes many recent commits, but
> I'd feel better if we understand what happened.
> 
> Sanne
> _______________________________________________
> infinispan-dev mailing list
> infinispan-dev at lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/infinispan-dev

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/infinispan-dev/attachments/20110428/d0869bd2/attachment.html