Conflict in merging kde-workspace KDE/4.8 → master
Jacopo De Simoi
wilderkde at gmail.com
Thu Dec 22 15:32:34 GMT 2011
I tried to merge forward the KDE/4.8 branch to master and I got the following error
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?
More information about the kde-core-devel