Closed stappersg closed 4 months ago
Is GitHub rebase and merge OK with you?
(I’m aware GitHub merge doesn’t respect all the original metadata)
Peter
On Mon, 15 Jul 2024 at 22:11, Geert Stappers @.***> wrote:
When #41 https://github.com/peterjc/mediawiki_to_git_md/pull/41 is accepted, I'll update this merge request.
Yes, I think it, #41 https://github.com/peterjc/mediawiki_to_git_md/pull/41 & #42 https://github.com/peterjc/mediawiki_to_git_md/pull/42, are two separate merge requests.
If you as project lead would have thmm in one request, just say so. I'll prepare 1 merge request with matching commit message. (Please avoid that github.com http://github.com mangles my commit messages by squashing commits.)
You can view, comment on, or merge this pull request online at:
https://github.com/peterjc/mediawiki_to_git_md/pull/42 Commit Summary
- d9c37c8 https://github.com/peterjc/mediawiki_to_git_md/pull/42/commits/d9c37c843cc7f9a5a2c909c0c52922d4ca2da957 The convert script has been renamed
- bc43e84 https://github.com/peterjc/mediawiki_to_git_md/pull/42/commits/bc43e8401520bc9ca1cb20b029f6669ddd267768 Add required option --input to README.rst
File Changes
(1 file https://github.com/peterjc/mediawiki_to_git_md/pull/42/files)
- M README.rst https://github.com/peterjc/mediawiki_to_git_md/pull/42/files#diff-7b3ed02bc73dc06b7db906cf97aa91dec2b2eb21f2d92bc5caa761df5bbc168f (2)
Patch Links:
- https://github.com/peterjc/mediawiki_to_git_md/pull/42.patch
- https://github.com/peterjc/mediawiki_to_git_md/pull/42.diff
— Reply to this email directly, view it on GitHub https://github.com/peterjc/mediawiki_to_git_md/pull/42, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAAPTV2XKGEPW3A4NPN3PCTZMQ3JVAVCNFSM6AAAAABK5JXH6CVHI2DSMVQWIX3LMV43ASLTON2WKOZSGQYDSNRUHA2TMNQ . You are receiving this because you are subscribed to this thread.Message ID: @.***>
Is GitHub rebase and merge OK with you?
I don't know. Increase the chance of avoiding mangled commits, please do the "Github rebase and merge" after merging of #41.
When #41 is accepted, I'll update this merge request.
Yes, I think it, #41 & #42, are two separate merge requests.
If you as project lead would have thmm in one request, just say so. I'll prepare 1 merge request with matching commit message. (Please avoid that github.com mangles my commit messages by squashing commits.)