Re: GITeando en linux :D
2015-06-11 15:24 GMT+02:00, Juan Lavieri <jlavieri@gmail.com>:
> Hola.
>
> El 11/06/15 a las 08:32, Ala de Dragón escibió:
(...)
>
> Y ¿Por casualidad hiciste lo que te indica esa línea?
>
> Porque tal vez allí te aclaren algo.
>
> Saludos
>
>
(...)
Si claro,
git pull
Warning: Permanently added the RSA host key for IP address
'192.30.252.128' to the list of known hosts.
warning: no common commits
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (5/5), done.
>From github.com:aladedragon/ala-live
* [new branch] master -> origin/master
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> master
git push origin master
To git@github.com:aladedragon/ala-live.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:aladedragon/ala-live.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
Sigo sin entenderlo......
:)
--
"El cielo es para los dragones
lo que el agua es para las ninfas"
Reply to: