Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Now recheck when changes made while typesetting #1147

Closed
wants to merge 10 commits into from
Closed

Now recheck when changes made while typesetting #1147

wants to merge 10 commits into from

Conversation

jaredwindover
Copy link
Contributor

Made changes as per dpvc's suggestions.
Added a flag mjPending to signal that the content has changed while the typesetting was happening. Setting the flag requeues CreatePreview(). This flag is then used for early exit instead of mjRunning This can close #1132.

@dpvc
Copy link
Member

dpvc commented Mar 31, 2015

The changes are good, but there is still a problem with the pull request. You have it targeted to develop, which is great, but the problem is that it is branched from master, where it should be branched from develop. Merges go from develop to master (creating a release), never the other direction. You can see that yours is the wrong direction because it includes a commit at the top that is not one of the ones that you made. Your commit history should include only your own changes, not ones due to merging a different branch into the develop branch.

So at this point there are two possible solutions: one would be to check out develop, create a new branch from there, copy your updated sample file and commit that fresh into the new branch, and then make another new pull request for that branch having only the one commit.

The other is to rebase the current branch from master to develop using the git rebase command.

I suspect the first approach is easier, though it loses the earlier commit history. In this case, that's probably fine, however.

@jaredwindover
Copy link
Contributor Author

Okay, I understand. I'll fix that and make a new PR. Thanks for your patience with this, I'm new to git and open-source contributing, and I really appreciate it.

@jaredwindover
Copy link
Contributor Author

Closing this in favor of #1148

@jaredwindover jaredwindover deleted the Preview_Patch branch March 31, 2015 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants