A pull/merge/push gone awry?

[i7]

A pull/merge/push gone awry?

[harvimt]

is 6a42dab the errant commit?

try git revert 6a42dab2e96fd79f12c00296f3246e042b04e466; git push if that's the problem.

[alice-blue]

6a42dab changed the correct file.

But this one seems to have made changes to Glk Object Recovery and Flexible Windows, neither of which I meant to touch.

[harvimt]

well then revert that one. :-)

[alice-blue]

I tried reverting but I think I'm doing something wrong. I will have to come back to this later. Thanks though.

[alice-blue]

Hmm. Even though this merge says that changes were made to Flexible Windows and Glk Recovery Object, when I go directly to FW and GRO in this repo, they don't show any new changes.

So...maybe it's just reflecting the changes that were made in my local repo when I merged, and not actually changing FW and GRO again in this repo. I didn't see a lot of merge commits when I looked at the repo history, though, so I'm not sure if this is how it's supposed to work.

For now maybe I will just leave it alone unless Dannii tells me otherwise--they are both extensions that he was working on.

[curiousdannii]

I'll take a look when I get home. It's probably fine.

[curiousdannii]

There's no problem, that's just how merge commits look sometimes.