background-parser changes: mimetype and partial parses

[David Nolden]

2010/8/22 Andreas Pakulat <apaku at gmx.de>:
> Well, IMHO you should just drop that branch, it doesn't make any sense
> in the devel clone to have master. One should use the official master
> instead.

That's true, it's annoying, I didn't know which one _really_ was the
master. On the other hand, it also doesn't make any sense to have the
master branch in a different repository than the devel-branches. So
IMO the simple solution is ditching the "devel" repository.

>> David: Can you please merge kdevplatform/master - i.e. _not_ devel-... ?
>
> That should be easy by doing git reset --hard HEAD~1 (in the moving-ranges branch to remove the merge
> commit from devel/master) and then doing the git merge origin/master (or
> whatever remote you use for the mainline repository). Afterwards you'll
> have to do a forced-push to the devel-repo, i.e. git push -f devel movingranges

Done..

Greetings, David