Issue 63

[randy-jr-olive]

page stack push is used in this fix to force push the localPages page back on top, which forces a reload of the book covers, they appear on top again after hitting the back button.

[randy-jr-olive]

ok, I can't figure out what I'm doing wrong with this fu&$$king commit thing. Here's the change you need for issue 63:

ToolbarItems {
    id: bookPageToolbar

    back: ToolbarButton {
        action: Action {
            text: i18n.tr("Library")
            iconName: "back"
            //this 3 step process forces book covers to return to top of page by force pushing the localBooks page
            onTriggered: {pageStack.pop(); pageStack.push(localBooks); pageStack.pop()}
        }
    }

[rschroll]

The problem with the merge is that your tree has diverged from mine some time ago. A git commit includes all the history leading up to it, so the merge request requires merging all the history from the commit. This wouldn't be too hard to clean up on the command line, but Github isn't going to do that automatically.

Practically, you should do one of two things:

1. Only make pull requests from branches based on my current (or nearly-current) master. This in turn means that you should probably keep your master in sync with mine, and only add commits to feature branches off of that.
2. Give up on pull requests, and just tell me to cherry pick some commits from your repository. In this case, you could just say, "Please cherry pick 338d075 and b0c57a6," and I could get them with a few commands.

Either one would be fine; pick whichever seems easiest to you.

Part of the reason this is happening is that I insist on rewriting history to get a clean commit log. This means that the commits that make it into my master are not the same as you give me, which has caused some of this divergence. But I'm not changing that, so you've got to pick (1) or (2).