rendered paste bodydaba@mobilrechner:~/compcomm/animation$ git push
updating 'refs/heads/master'
from eadc5ca0bd68fbc61e9acd47a40d2a17c3d85c81
to bca74a5898c8976c7d0beea0ac72aaecb2d29c57
Generating pack...
Done counting 51 objects.
Result has 30 objects.
Deltifying 30 objects...
100% (30/30) done
Writing 30 objects...
100% (30/30) done
Total 30 (delta 26), reused 0 (delta 0)
Unpacking 30 objects
refs/heads/master: eadc5ca0bd68fbc61e9acd47a40d2a17c3d85c81 -> bca74a5898c8976c7d0beea0ac72aaecb2d29c57
You are in the middle of a conflicted merge.
Already up-to-date.
error: pathspec '02f86deac139959d6bbdb64416d716ed2657bc09' did not match any file(s) known to git.
Did you forget to 'git add'?
rm 'src/animation/beamup.h'
rm 'src/animation/burn.h'
rm 'src/animation/curvedfold.h'
rm 'src/animation/dodge.h'
rm 'src/animation/domino.h'
rm 'src/animation/explode3d.h'
rm 'src/animation/fade.h'
rm 'src/animation/focusfade.h'
rm 'src/animation/glide.h'
rm 'src/animation/horizontalfold.h'
rm 'src/animation/leafspread.h'
rm 'src/animation/magiclamp.h'
rm 'src/animation/rollup.h'
rm 'src/animation/wave.h'
rm 'src/animation/zoomside.h'
Clone or pull plugin
Clone or pull merged repo
Processing commit 02f86deac139959d6bbdb64416d716ed2657bc09
Checkouting right commit
Looking for removed files
beamup.h > /dev/null
burn.h > /dev/null
curvedfold.h > /dev/null
dodge.h > /dev/null
domino.h > /dev/null
explode3d.h > /dev/null
fade.h > /dev/null
focusfade.h > /dev/null
glide.h > /dev/null
horizontalfold.h > /dev/null
leafspread.h > /dev/null
magiclamp.h > /dev/null
rollup.h > /dev/null
wave.h > /dev/null
zoomside.h > /dev/null
Processing files
animation-internal.h > src/animation/animation-internal.h
animation.c > src/animation/animation.c
animation.xml > metadata/animation.xml
animation_tex.h > src/animation/animation_tex.h
beamup.c > src/animation/beamup.c
burn.c > src/animation/burn.c
curvedfold.c > src/animation/curvedfold.c
dodge.c > src/animation/dodge.c
domino.c > src/animation/domino.c
dream.c > src/animation/dream.c
dream.h > src/animation/dream.h
explode3d.Created commit c0900f2: Function and variable scope cleanup.
15 files changed, 0 insertions(+), 73 deletions(-)
delete mode 100644 src/animation/beamup.h
delete mode 100644 src/animation/burn.h
delete mode 100644 src/animation/curvedfold.h
delete mode 100644 src/animation/dodge.h
delete mode 100644 src/animation/domino.h
delete mode 100644 src/animation/explode3d.h
delete mode 100644 src/animation/fade.h
delete mode 100644 src/animation/focusfade.h
delete mode 100644 src/animation/glide.h
delete mode 100644 src/animation/horizontalfold.h
delete mode 100644 src/animation/leafspread.h
delete mode 100644 src/animation/magiclamp.h
delete mode 100644 src/animation/rollup.h
delete mode 100644 src/animation/wave.h
delete mode 100644 src/animation/zoomside.h
fatal: you need to resolve your current index first
error: pathspec '9da430e54296a251ef97d323ba784fd41ae63e88' did not match any file(s) known to git.
Did you forget to 'git add'?
c > src/animation/explode3d.c
fade.c > src/animation/fade.c
focusfade.c > src/animation/focusfade.c
glide.c > src/animation/glide.c
horizontalfold.c > src/animation/horizontalfold.c
leafspread.c > src/animation/leafspread.c
magiclamp.c > src/animation/magiclamp.c
particle.c > src/animation/particle.c
polygon.c > src/animation/polygon.c
rollup.c > src/animation/rollup.c
wave.c > src/animation/wave.c
zoomside.c > src/animation/zoomside.c
Commiting
Processing commit 9da430e54296a251ef97d323ba784fd41ae63e88
Checkouting right commit
Looking for removed files
Processing files
animation-internal.h > src/animation/animation-internal.h
animation.c > src/animation/animation.c
animation.xml > metadata/animation.xml
animation_tex.h > src/animation/animation_tex.h
beamup.c > src/animation/beamup.c
burn.c > src/animation/burn.c
curvedfold.c > src/animation/curvedfold.c
dodge.c > src/animation/dodge.c
domino.c > src/animation/domino.c
dream.c # On branch master
nothing to commit (working directory clean)
fatal: you need to resolve your current index first
error: pathspec 'bca74a5898c8976c7d0beea0ac72aaecb2d29c57' did not match any file(s) known to git.
Did you forget to 'git add'?
> src/animation/dream.c
dream.h > src/animation/dream.h
explode3d.c > src/animation/explode3d.c
fade.c > src/animation/fade.c
focusfade.c > src/animation/focusfade.c
glide.c > src/animation/glide.c
horizontalfold.c > src/animation/horizontalfold.c
leafspread.c > src/animation/leafspread.c
magiclamp.c > src/animation/magiclamp.c
particle.c > src/animation/particle.c
polygon.c > src/animation/polygon.c
rollup.c > src/animation/rollup.c
wave.c > src/animation/wave.c
zoomside.c > src/animation/zoomside.c
Commiting
Processing commit bca74a5898c8976c7d0beea0ac72aaecb2d29c57
Checkouting right commit
Looking for removed files
Processing files
animation-internal.h > src/animation/animation-internal.h
animation.c > src/animation/animation.c
animation.xml > metadata/animation.xml
animation_tex.h > src/animation/animation_tex.h
beamup.c > src/animation/beamup.c
burn.c > src/animation/burn.c
curvedfold.c > src/animation/curvedfold.c
dodge.c # On branch master
nothing to commit (working directory clean)
fatal: you need to resolve your current index first
updating 'refs/heads/master'
from 17af2b7001dd50dbb87a8979694981d57c636a1f
to c0900f28fd82b1261ad46751293f28f03f28203d
Generating pack...
Done counting 7 objects.
Result has 4 objects.
Deltifying 4 objects.
100% (4/4) done
Writing 4 objects.
100% (4/4) done
Total 4 (delta 3), reused 0 (delta 0)
Unpacking 4 objects
refs/heads/master: 17af2b7001dd50dbb87a8979694981d57c636a1f -> c0900f28fd82b1261ad46751293f28f03f28203d
> src/animation/dodge.c
domino.c > src/animation/domino.c
dream.c > src/animation/dream.c
dream.h > src/animation/dream.h
explode3d.c > src/animation/explode3d.c
fade.c > src/animation/fade.c
focusfade.c > src/animation/focusfade.c
glide.c > src/animation/glide.c
horizontalfold.c > src/animation/horizontalfold.c
leafspread.c > src/animation/leafspread.c
magiclamp.c > src/animation/magiclamp.c
particle.c > src/animation/particle.c
polygon.c > src/animation/polygon.c
rollup.c > src/animation/rollup.c
wave.c > src/animation/wave.c
zoomside.c > src/animation/zoomside.c
Commiting
Pushing
Merging done