|
|
|
@ -584,17 +584,7 @@ After doing this, you may fix the identity used for this commit with:
|
|
|
|
|
|
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
|
|
|
|
|
$ git push
|
|
|
|
|
Enter passphrase for key '/c/Users/u111-09/.ssh/id_rsa':
|
|
|
|
|
To uit.mpei.ru:NovikovDM/cs-lab02
|
|
|
|
|
! [rejected] master -> master (fetch first)
|
|
|
|
|
error: failed to push some refs to 'git@uit.mpei.ru:NovikovDM/cs-lab02'
|
|
|
|
|
hint: Updates were rejected because the remote contains work that you do
|
|
|
|
|
hint: not have locally. This is usually caused by another repository pushing
|
|
|
|
|
hint: to the same ref. You may want to first integrate the remote changes
|
|
|
|
|
hint: (e.g., 'git pull ...') before pushing again.
|
|
|
|
|
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
u111-09@PROG-29 MINGW32 ~/Desktop/lab02/bob/project (master)
|
|
|
|
|
$ git pull
|
|
|
|
|