All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Joachim Schmitz" <jojo@schmitz-digital.de>
To: git@vger.kernel.org
Subject: How to update a cloned git repository
Date: Tue, 11 Sep 2012 12:49:01 +0200	[thread overview]
Message-ID: <k2n4v2$88t$1@ger.gmane.org> (raw)

Hi folks

Probably a beginner's question...

If I did a
    git clone git://guthub.com/git/git.git
and worked on some own branches of pu
    git checkout pu;git checkout -p mybranch;hack;hack;...;git commit -a -s
how to update my repository once the the one on github changed?
A plain
    git pull
or
    git fetch;git merge
keeps failing on my with lots of conflicts, none of which relate to any of 
the changes I did (and hence wouldn't know how to resolve)


Bye, Jojo 

             reply	other threads:[~2012-09-11 10:49 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-11 10:49 Joachim Schmitz [this message]
2012-09-11 11:06 ` How to update a cloned git repository Matthieu Moy
2012-09-11 11:17   ` Joachim Schmitz
2012-09-11 11:21     ` Matthieu Moy
     [not found]       ` <007001cd9016$8f980f80$aec82e80$@schmitz-digital.de>
2012-09-11 12:40         ` Matthieu Moy
2012-09-11 12:48           ` Joachim Schmitz
2012-09-11 13:07           ` Erik Faye-Lund
2012-09-11 16:05           ` Junio C Hamano
2012-09-11 16:21             ` Matthieu Moy
2012-09-11 16:46             ` Joachim Schmitz
2012-09-12  8:52               ` Matthieu Moy
2012-09-11 14:09     ` Sitaram Chamarty
2012-09-11 16:00     ` Junio C Hamano
2012-09-11 16:45       ` Joachim Schmitz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='k2n4v2$88t$1@ger.gmane.org' \
    --to=jojo@schmitz-digital.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.