"Tweaks" branch not included?

[david-a-wheeler]

I created a "tweaks" branch with a lot of changes. E.g., it included commit 96d4925 with lots of small changes. Here's the tree.

For example, it says changed "There are two parties involved" to "There are at least two parties involved".

Somehow that didn't get merged in, but I thought I'd sent in a pull request. I'll try again, but this may create some hand-work to work out merge conflicts.

[david-a-wheeler]

@annabellegoth2boss - I'm not sure what happened here.

I thought the changes had been merged, but now I don't think so.

Thoughts?

[david-a-wheeler]

I have to rush on something else, but I'd like to review & make sure that my changes were either accepted or correctly rejected. I suspect this is easily explained but I haven't had time to check it.

[annabellegoth2boss]

I bet when we addressed the merge conflicts in the meeting two weeks ago something got missed, or later committed over...taking a look now...

[annabellegoth2boss]

I think with the #18 and #19 PRs merged, it brought back in your commits from before. Does it look good to you?

[david-a-wheeler]

Yes, they're fine. I'll close this.

Jason Perlow (LF editor) developed some proposed editorial fixes. I'll post them as a new branch, but I have to convert them from MS Word first :-(.