On Wed, 2014-07-23 at 15:09 +0200, Kevin wrote:
On Jul 23, 2014 5:11 AM, Ross Boylan r...@biostat.ucsf.edu wrote:
My local master branch is the result of a merge of upstream master
and
some local changes. I want to merge in more recent upstream work.
git pull doesn't seem to have
.
For reasons given below, Chris's theory that there was a conflict also
doesn't seem to apply.
On Wed, 2014-07-23 at 19:40 +1200, Chris Packham wrote:
On 23/07/14 14:49, Ross Boylan wrote:
My local master branch is the result of a merge of upstream master and
some local changes. I want to merge
On Wed, 2014-07-23 at 14:41 -0700, Junio C Hamano wrote:
Ross Boylan r...@biostat.ucsf.edu writes:
I still don't know what I need to do to update origin/master in my local
repo.
Regarding Kevin's suggestion, I just tried git fetch origin master.
I think Kevin's suggestion
On Wed, 2014-07-23 at 16:51 -0700, Junio C Hamano wrote:
Ross Boylan r...@biostat.ucsf.edu writes:
Either
git fetch origin master:refs/remotes/origin/master
Great; that works.
Is that procedure supposed to be the usual way I track upstream in this
(1.7) version of git? It seems
My local master branch is the result of a merge of upstream master and
some local changes. I want to merge in more recent upstream work.
git pull doesn't seem to have updated origin/master, and git checkout
origin/master also doesn't seem to work.
Here's some info that may be relevant.
5 matches
Mail list logo
