История изменений
Исправление strangeman, (текущая версия) :
Поехали сначала:
Попытался запушить, гит ругнулся:
strangeman@strangepc:~/sources/1/puppet$ git push
To /home/strangeman/sources/puppet.git/
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to '/home/strangeman/sources/puppet.git/'
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.
Делаем git pull, как и посоветовал git:
strangeman@strangepc:~/sources/1/puppet$ git pull
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /home/strangeman/sources/puppet
cf067ea..bbfd925 master -> origin/master
Auto-merging puppet.conf
CONFLICT (content): Merge conflict in puppet.conf
Automatic merge failed; fix conflicts and then commit the result.
Лезем в файлы, которые помечены как конфликтные, смотрим что гит там нарулил, правим если надо. Потом коммитим отмерженную версию
strangeman@strangepc:~/sources/1/puppet$ git commit -a
[master 0cfe31c] Merge branch 'master' of /home/strangeman/sources/puppet
Потом спокойно ее пушим. Все.
strangeman@strangepc:~/sources/1/puppet$ git push
Counting objects: 10, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (6/6), 618 bytes, done.
Total 6 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
To /home/strangeman/sources/puppet.git/
bbfd925..0cfe31c master -> master
В чем проблема-то?
Исходная версия strangeman, :
Поехали сначала:
Попытался запушить, гит ругнулся:
strangeman@strangepc:~/sources/1/puppet$ git push To /home/strangeman/sources/puppet.git/ ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to '/home/strangeman/sources/puppet.git/' 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.
Делаем git pull, как и посоветовал git:
strangeman@strangepc:~/sources/1/puppet$ git pull remote: Counting objects: 5, done. remote: Compressing objects: 100% (3/3), done. remote: Total 3 (delta 2), reused 0 (delta 0) Unpacking objects: 100% (3/3), done. From /home/strangeman/sources/puppet cf067ea..bbfd925 master -> origin/master Auto-merging puppet.conf CONFLICT (content): Merge conflict in puppet.conf Automatic merge failed; fix conflicts and then commit the result.
Лезем в файлы, которые помечены как конфликтные, смотрим что гит там нарулил, правим если надо. Потом коммитим отмерженную версию
strangeman@strangepc:~/sources/1/puppet$ git commit -a [master 0cfe31c] Merge branch 'master' of /home/strangeman/sources/puppet
Потом спокойно ее пушим. Все.
strangeman@strangepc:~/sources/1/puppet$ git push Counting objects: 10, done. Delta compression using up to 4 threads. Compressing objects: 100% (6/6), done. Writing objects: 100% (6/6), 618 bytes, done. Total 6 (delta 4), reused 0 (delta 0) Unpacking objects: 100% (6/6), done. To /home/strangeman/sources/puppet.git/ bbfd925..0cfe31c master -> master
В чем проблема-то?