search

tunapanda / provision

System for provisioning a new virtual machine with Tunapanda Edubuntu
7 stars 12 forks source link

I think GitHub is confused... #24

Closed usernamenumber closed 9 years ago

usernamenumber commented 9 years ago

After a merge it says my repo is six commits ahead of upstream, but that there are zero differences between the two. Creating this PR so that github will agree that they are in sync.

OmarIthawi commented 9 years ago

Hi @usernamenumber this is actually weird. But even my local $ git thinks it's the same.

So neither $ git diff tunapanda/master...usernamenumber/master nor git diff usernamenumber/master...tunapanda/master gives any result,

My best guess that the last two commits (4ee1df1 and a1b4e63) are effectively undoing everything else! I didn't check every possible details though.

My question is why are you doing a merge from master in a local branch. You usually don't have to! Just issue a pull request.

I'll issue a pull request shortly to try to fix the issue.

usernamenumber commented 9 years ago

Hmmm... my understanding was that you should merge in the latest version of the target branch before pushing changes, so I assumed the same is true for pull requests. You're saying that isn't necessary for a pull request? I'll look into it more, and rebase away the last two updates if needed.

usernamenumber commented 9 years ago

Ok. After confirming that there's no actual difference between my usernamenumber/master and tunapanda/master, I reset the former to point to the latter's HEAD, and did a push --force, so now their logs match as well and github thinks they're even. Closing this PR. Thanks for the sanity-check, @OmarIthawi!

OmarIthawi commented 9 years ago

No worries :), glad I helped :)