patchreview.cpp diverged in master/movingranges

Andreas Pakulat apaku at gmx.de
Fri Aug 20 18:40:21 UTC 2010


On 20.08.10 20:26:52, Milian Wolff wrote:
> David - could it be that you changes patchreview in movingranges branch? Apol 
> changes something in master as well and they differ now. I'm not confident to 
> solve the conflict that is created from that. There are some more conflicts in 
> vcs/* that I didn't even look at.

I saw David doing various changes unrelated to the movingranges-porting
in the branch. Unfortunately he didn't respond yet why he did so...

I'll try to take a look at the vcs-stuff over the weekend unless someone
beats me to it.

Andreas

-- 
You never hesitate to tackle the most difficult problems.




More information about the KDevelop-devel mailing list