Sorry to bother again. I am using #git checkout features/chat2 error: you need to resolve your current index first po/sk.po: needs merge
#git stash
po/sk.po: needs merge
po/sk.po: unmerged (1f6e1949e332498c7c926239e9b4ceba4425a432)
po/sk.po: unmerged (5745192072e23b96d582f7a3826b164cf1a63aeb)
po/sk.po: unmerged (06af1a199e8797ce1f88c587e7aee17fef43872d)
fatal: git-write-tree: error building trees
Cannot save the current index state
#git checkout po/sk.po
error: path 'po/sk.po' is unmerged
#git merge
error: 'merge' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.
#git pull --rebase
U po/sk.po
Pull 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, or use 'git commit -a'.
#git reset --hard features/chat2
HEAD is now at 8cf1210 Multi-view XMPP chat.
#########################
OK, now it feels, like I can add po/sk.po again
#git commit po/sk.po
1 file changed, 2915 insertions(+), 2795 deletions(-)
#git push
Counting objects: 7, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 11.24 KiB, done.
Total 4 (delta 3), reused 0 (delta 0)
remote: Traceback (most recent call last):
remote: File "hooks/post-receive", line 139, in <module>
remote: main()
remote: File "hooks/post-receive", line 129, in main
remote: with open(log_file_path, 'a') as log_file:
remote: IOError: [Errno 2] No such file or directory: ''
To g...@git.lyx.org:developers/tommaso/lyx
8cf1210..775926a features/chat2 -> features/chat2
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'g...@git.lyx.org:developers/tommaso/lyx'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
............................
Lost again. What a hell!
Kornel
signature.asc
Description: This is a digitally signed message part.
