git - Getting a "subproject commit" message when I send a pull request, and I'm told to merge in the upstream changes. What do I do? -

when sent pull request changes repo, this: + subproject commit: *numbers* , told try merge in upstream changes.

how go doing this? tried using git fetch origin local repo, mergetool, says: no files need merging.

you're being asked update branch changes made project since forked branch. example project history might now:

a  <- master | b  e  <-- branch submitted pull request. |  | c  d | / f   <-- fork branch , start working. 

note there commits (a, b, , c) not in branch history. last common commit between branch , master f. project maintainer wants merge a, b, , c branch history of branch looks this:

   m  <-- new tip of branch.   /|  / |  <- master |  | b  e   |  | c  d | / f   <-- fork branch , start working. 

this way if there conflicts between a, b, c , commits e, d have resolve them. project maintainer can merge pull request without needing resolve conflicts merging commit m.

to update origin have checkout branch , run command git merge origin/master (assuming master upstream head). if there conflicts run git mergetool , walk through conflict resolution. commit merge , update pull request merged commit.

if you've not read highly recommend online git book. here section on branching , merging.