swaldman: A cute fluffy sheep curled up dreaming of Dreamwidth. Labelled "Simon: Bodger". (dw-dev)
Simon ([personal profile] swaldman) wrote in [site community profile] dw_dev2013-09-07 06:01 pm
Entry tags:

Your branch is ahead of 'upstream/develop' by 540 commits.

~/dw (develop)$ git status
# On branch develop
# Your branch is ahead of 'upstream/develop' by 540 commits.

Did we ever figure out what causes this? I have a theory, but I don't really understand...

(Theory: the dwu script does "git pull --ff-only upstream develop" straight from the remote repo into the local develop branch. This doesn't update the local copy of "remotes/upstream/develop" that was created by a "git fetch" sometime in the past. This is what the current branch is being compared to. I have no idea whether this makes sense, and if so how to deal with it...)
fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)

[personal profile] fu 2013-09-20 04:32 am (UTC)(link)

If you're still unsure, make a new top-level post to see if anyone else has any objections :)

sophie: A cartoon-like representation of a girl standing on a hill, with brown hair, blue eyes, a flowery top, and blue skirt. ☀ (Default)

[personal profile] sophie 2013-09-24 01:30 pm (UTC)(link)
I know I've had odd issues in the past when manually doing a fetch/merge instead of a pull. I expected the two to be equivalent, but that wasn't the case. I don't remember what happened, though.