git merge -Xtheirs origin/KDE/4.8The problem is that i get like a bazillion conflicts in .desktop files and i can't resolve them by hand, since i cannot read most of the conflicts :-(
Cheers, Thomas
git merge -Xtheirs origin/KDE/4.8The problem is that i get like a bazillion conflicts in .desktop files and i can't resolve them by hand, since i cannot read most of the conflicts :-(
Cheers, Thomas