[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kdevelop-devel
Subject:    Re: URGENT: KDevplatform 1.1 branch messed up!
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2010-12-03 13:41:13
Message-ID: 20101203134113.GB31615 () neo ! apaku ! dnsalias ! org
[Download RAW message or body]

On 03.12.10 14:01:53, Andreas Pakulat wrote:
> On 03.12.10 12:55:44, Milian Wolff wrote:
> > Hey all,
> > 
> > the kdevplatform 1.1 branch is totally messed up, it contains lots of commits 
> > from master?! I don't know why, can someone investigate and clean this up?
> 
> I can fix that, but everyone will have to rebase any branches created from
> master since f397e9504eff43f85a1e0f15d3272583e6569526 and I won't have time
> probably before 11pm or so...
> 
> Though basically its easy:
> 
> git checkout 1.1
> git reset --hard f397e9504eff43f85a1e0f15d3272583e6569526

Sorry, that is wrong, it should be
c771e056e595757b3eed8677235747cf257fd14c, thats the last one on my anongit
remote in 1.1.

Andreas

-- 
You will be imprisoned for contributing your time and skill to a bank robbery.

-- 
KDevelop-devel mailing list
KDevelop-devel@kdevelop.org
https://barney.cs.uni-potsdam.de/mailman/listinfo/kdevelop-devel
[prev in list] [next in list] [prev in thread] [next in thread]