search

joelware / RoadKill

RoadKill iPhone app for reporting road kill
10 stars 2 forks source link

git pull doesn't #2

Closed halmueller closed 14 years ago

halmueller commented 14 years ago

Throws this error:

balmoral:RoadKill hal$ git pull You asked me to pull without telling me which branch you want to merge with, and 'branch.datamodel.merge' in your configuration file does not tell me, either. Please specify which branch you want to use on the command line and try again (e.g. 'git pull '). See git-pull(1) for details.

If you often merge with the same branch, you may want to use something like the following in your configuration file:

[branch "datamodel"]
remote = <nickname>
merge = <remote-ref>

[remote "<nickname>"]
url = <url>
fetch = <refspec>
halmueller commented 14 years ago

Apparently some editing of .git/config is required?

hickey commented 14 years ago

Not always. Can you post the outputs of the git status and git branch -a commands?

hickey commented 14 years ago

Thinking for 10 secs, I suspect you were not following a remote branch, thus the pull command had no way of knowing what branch to do the merge with. A pull does a fetch then a merge, whereas a fetch does just a fetch (of course).

halmueller commented 14 years ago 
Last login: Fri Oct 15 13:21:05 on console
balmoral:~ hal$ cd DevelopmentSandbox/RoadKill/
balmoral:RoadKill hal$ git pull
remote: Counting objects: 54, done.
remote: Compressing objects: 100% (28/28), done.
remote: Total 29 (delta 16), reused 0 (delta 0)
Unpacking objects: 100% (29/29), done.
From github.com:joelware/RoadKill
   ff1c047..76b5dad  datamodel  -> origin/datamodel
 * [new branch]      map        -> origin/map
   4903f7a..68bf228  master     -> origin/master
 * [new branch]      parnoneData -> origin/parnoneData
You asked me to pull without telling me which branch you
want to merge with, and 'branch.datamodel.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull  ').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

    [branch "datamodel"]
    remote = 
    merge = 

    [remote ""]
    url = 
    fetch = 

See git-config(1) for details.
balmoral:RoadKill hal$ git pull
remote: Counting objects: 66, done.
remote: Compressing objects: 100% (35/35), done.
remote: Total 43 (delta 27), reused 0 (delta 0)
Unpacking objects: 100% (43/43), done.
From github.com:joelware/RoadKill
   76b5dad..b5e7d31  datamodel  -> origin/datamodel
   68bf228..48a3bf9  master     -> origin/master
You asked me to pull without telling me which branch you
want to merge with, and 'branch.datamodel.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull  ').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

    [branch "datamodel"]
    remote = 
    merge = 

    [remote ""]
    url = 
    fetch = 

See git-config(1) for details.
balmoral:RoadKill hal$ git merge origin
Updating ff1c047..48a3bf9
Fast-forward
 CODE/RoadKill/Classes/Observation.h                |    9 +-
 CODE/RoadKill/Classes/Observation.m                |   35 +++--
 CODE/RoadKill/Classes/RKConstants.h                |    4 +-
 CODE/RoadKill/Classes/RoadKillAppDelegate.m        |    2 +-
 CODE/RoadKill/Classes/State.h                      |   32 +++++
 CODE/RoadKill/Classes/State.m                      |   20 +++
 CODE/RoadKill/Classes/User.h                       |   31 +++++
 CODE/RoadKill/Classes/User.m                       |   19 +++
 CODE/RoadKill/DataModelTestCase.h                  |   30 +++++
 CODE/RoadKill/DataModelTestCase.m                  |  131 ++++++++++++++++++++
 .../RoadKill.xcdatamodel/elements                  |  Bin 14583 -> 42346 bytes
 .../RoadKill.xcdatamodel/layout                    |  Bin 4021 -> 11574 bytes
 CODE/RoadKill/RoadKill.xcodeproj/project.pbxproj   |   26 ++++
 CODE/RoadKill/Unit Tests/WebAPITestCase.h          |   10 ++-
 CODE/RoadKill/Unit Tests/WebAPITestCase.m          |   81 ++++++++++++
 README                                             |    1 +
 .../UCDavisMockAppRoadkill_20101009bb.key          |  Bin 0 -> 62639648 bytes
 17 files changed, 411 insertions(+), 20 deletions(-)
 create mode 100644 CODE/RoadKill/Classes/State.h
 create mode 100644 CODE/RoadKill/Classes/State.m
 create mode 100644 CODE/RoadKill/Classes/User.h
 create mode 100644 CODE/RoadKill/Classes/User.m
 create mode 100644 CODE/RoadKill/DataModelTestCase.h
 create mode 100644 CODE/RoadKill/DataModelTestCase.m
 create mode 100644 REQMTS&DESIGN/UCDavisMockAppRoadkill_20101009bb.key
balmoral:RoadKill hal$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.datamodel.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull  ').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

    [branch "datamodel"]
    remote = 
    merge = 

    [remote ""]
    url = 
    fetch = 

See git-config(1) for details.
balmoral:RoadKill hal$ git status
# On branch datamodel
# Untracked files:
#   (use "git add ..." to include in what will be committed)
#
#   CODE/RoadKill/RoadKill.xcodeproj/hal.pbxuser
#   CODE/RoadKill/RoadKill.xcodeproj/hal.perspectivev3
#   REQMTS&DESIGN/California Roadkill Observation System API.htm.~1~
nothing added to commit but untracked files present (use "git add" to track)
balmoral:RoadKill hal$ git status
# On branch datamodel
# Untracked files:
#   (use "git add ..." to include in what will be committed)
#
#   CODE/RoadKill/RoadKill.xcodeproj/hal.pbxuser
#   CODE/RoadKill/RoadKill.xcodeproj/hal.perspectivev3
#   REQMTS&DESIGN/California Roadkill Observation System API.htm.~1~
nothing added to commit but untracked files present (use "git add" to track)
balmoral:RoadKill hal$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.datamodel.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull  ').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

    [branch "datamodel"]
    remote = 
    merge = 

    [remote ""]
    url = 
    fetch = 

See git-config(1) for details.
balmoral:RoadKill hal$ 
balmoral:RoadKill hal$ 
balmoral:RoadKill hal$ 
balmoral:RoadKill hal$ git pull origin
You asked to pull from the remote 'origin', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
balmoral:RoadKill hal$ pwd
/Users/hal/DevelopmentSandbox/RoadKill
balmoral:RoadKill hal$ emacs .git/config 
balmoral:RoadKill hal$ git pull
You asked me to pull without telling me which branch you
want to merge with, and 'branch.datamodel.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull  ').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

    [branch "datamodel"]
    remote = 
    merge = 

    [remote ""]
    url = 
    fetch = 

See git-config(1) for details.
balmoral:RoadKill hal$ history|grep clone
  268  git clone git@github.com:joelware/RoadKill.git RoadKill
  272  git clone git@github.com:joelware/RoadKill.git RoadKill
  439  git clone git@github.com:halmueller/practice GitPractice
  466  history|grep clone
balmoral:RoadKill hal$ cd ..
balmoral:DevelopmentSandbox hal$ rm -Rf RoadKill/