roico@roico-desktop:~/Compiz-Beryl/compiz$ git pull
Trying really trivial in-index merge...
plugins/cube.c: needs merge
fatal: you need to resolve your current index first
Nope.
Merging HEAD with 1868183baa0e440a33636bb2e8252c87f344e54a
Merging:
6a6c944 transparent cube
1868183 Check that xsltproc binary is present.
found 1 common ancestor(s):
da661aa Update po files.
fatal: Entry 'plugins/cube.c' would be overwritten by merge. Cannot merge.
No merge strategy handled the merge.
roico@roico-desktop:~/Compiz-Beryl/compiz$