Hi,
When running the ./install script I do get this error.
err: /Stage[main]//Node[gitorious-ce]/Gitorious::Version[v2.4.12]/Exec[fet
ch_gitorious_tag]/returns: change from notrun to 0 failed: sh -c 'cd /var/www/gi
torious/app && git fetch --tags && git merge v2.4.12 && touch /var/www/gitorious
/deployed_tags/v2.4.12' returned 128 instead of one of [0] at /root/ce-installer
/modules/gitorious/manifests/templates.pp:21
Seems that merging gives error:
# git merge v2.4.12
fatal: 'merge' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
When checking git mergetool, I get quite few files with conflicts.
Any tips to continue with commit: 06125a3b2ae00717dd86fd7b697648d83b3bce52 as
a latest commit?
Thanks a lot,
-Mika
--
--
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
---
You received this message because you are subscribed to the Google Groups
"Gitorious" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
