-
Notifications
You must be signed in to change notification settings - Fork 424
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
Correct documentation for Date.match() #1773
Correct documentation for Date.match() #1773
Conversation
I think you may have accidentally included your changes for #1772 here. |
Yes, I thought that might have happened - basically I don't know what I am doing. I have used git for trivial things but nothing requiring PRs. I merged the 1772 branch into the local maint/gramps52 then created the new branch off that. |
No need for that; you can rebase and drop the extra commits from here since they are separate branches:
In the editor that opens, delete every line except for the last one about bug 13428, save and exit to run the rebase. After the rebase, you can check the log should show only the one commit on this branch:
And if everything is okay, force push to GitHub:
If not okay, then reset back to the copy you have here:
|
e2bbf66
to
af9fa53
Compare
Thanks... OK, I think I have managed to fix it - or at least I can say it has changed. Your rebase command resulted in a file with only the single commit, so I tried |
Sorry, I missed this line; you probably don't want to merge your branches into upstream branches. Just wait until they are merged in this repo. To be more explicit, the first step I gave could have been |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. Thanks!
af9fa53
to
df37ff1
Compare
Also added more detail to documentation in 3 other cases. Fixes #13428
df37ff1
to
4778a82
Compare
4778a82
into
gramps-project:maintenance/gramps52
This is just documentation changes for date.py.
Fixes bug #13428.