CODEWITHSUNDEEP
git
justify
justify

Reputation: 1076

Git working with remote merges

I've been reading Pro Git, and I think I get how things should be done. But I might have made some weird adjustments in my ignorence before, maybe egit made incomplete changes to the repo one of the times it cause eclipse to crash or I'm just missing something. I've now given up on egit & am using git from the cmd line.

Am trying to merge from a remote and I get the following:

[root@localhost justifventures-opentaps]# git remote -v
origin  http://git.gitorious.org/opentaps/opentaps.git (fetch)
origin  http://git.gitorious.org/opentaps/opentaps.git (push)
[root@localhost justifventures-opentaps]# git remote show
origin
[root@localhost justifventures-opentaps]# git remote show origin
* remote origin
  Fetch URL: http://git.gitorious.org/opentaps/opentaps.git
  Push  URL: http://git.gitorious.org/opentaps/opentaps.git
  HEAD branch: master
  Remote branches:
    1.5M1       new (next fetch will store in remotes/origin)
    dataimport  new (next fetch will store in remotes/origin)
    master      new (next fetch will store in remotes/origin)
    upgrade-1.5 new (next fetch will store in remotes/origin)
  Local ref configured for 'git push':
    master pushes to master (local out of date)
[root@localhost justifventures-opentaps]# git merge origin/master
fatal: 'origin/master' does not point to a commit
[root@localhost justifventures-opentaps]#

One of the things that worries me is that this remote is suppossed to be read only, so am not sure why there is the line:

origin  http://git.gitorious.org/opentaps/opentaps.git (push)

Also it says :

Local ref configured for 'git push': master pushes to master (local out of date)

I'm not sure if this has anything to do with the problem. I've tried removing the remotes and adding them again but this config seems to be the same.

Hopefully someone with more experience can shed some light on my confusion.

Upvotes: 2

Views: 6641

Answers (1)

Paŭlo Ebermann
Paŭlo Ebermann

Reputation: 74750

It looks like you'll have to do a git fetch origin first before trying to merge from origin/master, since somehow your local origin/master branch got out of date, or even totally messed up.

Upvotes: 5

Related Questions