Merge Conflicts updating wp submodule

[kiosktm]

Greetings,

I tried to do a "git pull origin master" from the wp submodule folder and got a log of merge conflicts. As we haven't updated any of the files locally, the source of these conflicts is unclear. Anyone else see this?

[drewhammond]

I'm somewhat of a git rookie so I don't know what causes the conflicts exactly but for what it's worth git pull origin 3.8-branch works without conflicts.

[vjwilson]

I tried @drewhammond 's method of specifying the branch in the pull command, but I still got a plethora of merge conflicts.

I tried a bunch of commands but the solution was simple. It turned out that since I hadn't touched the wp submodule since I had initialized it, it was in a "detached" state. Checking out the master branch first allowed for a fast-forward merge:

van@desdemona: wp ((detached from 3.8.2)) $ git co master
Previous HEAD position was 5577e02... Tag 3.8.2
Switched to branch 'master'
Your branch is behind 'origin/master' by 2503 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
van@desdemona: wp (master) $ git pull origin master
From git://github.com/WordPress/WordPress
 * branch            master     -> FETCH_HEAD
Updating 5ca1024..c64402e
Fast-forward
...

Hope this helps other people.