Hi Richard,

what is the return of the command git remote show origin?


William Seiti Mizuta
@williammizuta
Caelum | Ensino e Inovação
www.caelum.com.br


On Wed, Jul 10, 2013 at 4:07 PM, Richard Marais <richardmar...@gmail.com>wrote:

> I am trying to push just one commit to origin master. However I get an
> error saying I first need to fetch then merge, but I get this error after a
> pull. Any ideas would be appreciated.
>
> Richard@RICHARD-PC /e/Work/MH (master)
> $ git pull
> remote: Counting objects: 27, done.
> remote: Compressing objects: 100% (11/11), done.
> remote: Total 14 (delta 8), reused 0 (delta 0)
> Unpacking objects: 100% (14/14), done.
> From file:///V:\
>    930430f..3a55dca  master     -> origin/master
> Auto-merging 
> buyit/src/main/java/com/company/buyit/outgoing/HttpsCallService.java
> Merge made by the 'recursive' strategy.
>  .../java/com/company/buyit/auth/BcagHmacGenerator.java  |  2 +-
>  .../com/company/buyit/outgoing/HttpsCallService.java    | 16 ++--------------
>  deployLocal.sh                                           |  2 +-
>  3 files changed, 4 insertions(+), 16 deletions(-)
>
> Richard@RICHARD-PC /e/Work/MH (master)
> $ git push origin 72ba712:master
> To file:///V:\
>  ! [rejected]        72ba712 -> master (non-fast-forward)
> error: failed to push some refs to 'file:///V:\'
> hint: Updates were rejected because the tip of your current branch is behind
> hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
> hint: before pushing again.
> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>
> Here is the list of commits, not the position of 72ba712:
>
> Richard@RICHARD-PC /e/Work/MH (master)
> $ git lol
> *   eec2ab2 (HEAD, master) Merge branch 'master' of file:///V:\
> |\
> | * 3a55dca (origin/master) <comments>
> * | 72ba712 <comments>
> * | bc55eb5 <comments>
> * |   c2aa448 Merge branch 'master' of file:///V:\
> |\ \
> | |/
> | * 930430f <comments>
> * | fc7a55b <comments>
> * | fd401a5 <comments>
>
>  --
> You received this message because you are subscribed to the Google Groups
> "Git for human beings" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to git-users+unsubscr...@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>
>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.


Reply via email to