Conflict in merging kde-workspace KDE/4.8 → master

Aaron J. Seigo aseigo at
Thu Dec 22 16:27:21 GMT 2011

On Thursday, December 22, 2011 16:32:34 Jacopo De Simoi wrote:
> Hi guys,
> I tried to merge forward the KDE/4.8 branch to master and I got the
> following error
> Auto-merging kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop
> CONFLICT (add/add): Merge conflict in
> kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop Automatic merge failed;
> fix conflicts and then commit the result.
> What should be done to take care of this?

i merged KDE/4.8 into master earlier today, and dealt with this conflict in the 

p.s. for others wondering, it's in kde-workspace :)

Aaron J. Seigo
humru othro a kohnu se
GPG Fingerprint: 8B8B 2209 0C6F 7C47 B1EA  EE75 D6B7 2EB1 A7F1 DB43

KDE core developer sponsored by Qt Development Frameworks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <>

More information about the kde-core-devel mailing list