Skip to content
New issue

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

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

Already on GitHub? # to your account

Discarded merging of #7 and #8 #9

Closed
tarsius opened this issue Aug 19, 2022 · 2 comments
Closed

Discarded merging of #7 and #8 #9

tarsius opened this issue Aug 19, 2022 · 2 comments

Comments

@tarsius
Copy link

tarsius commented Aug 19, 2022

Describe the bug

You merged #7 and #8 three weeks ago, but a few days ago you discarded those commits. Was that intentional?

To Reproduce

7278052 * origin/master Add function to update modification time
edba7bc | *   mirror/master Merge pull request #8 from rockstorm101/id-regexp
        | |\  
890ce58 | | * Allow customising ID regexp pattern
        | |/  
        |/|   
a6c8ac8 | * Merge pull request #7 from ymherklotz/custom-id-support
        |/| 
5fa9480 | * Add new function to create custom ID
13f415f | * Update copyright
        |/  
9eb18ec * Prioritise org-zettelkasten

Expected behavior

Don't rewrite history except maybe to amend a rather recent HEAD.

Additional context

I maintain the Emacsmirror and when suspicious history rewriting happens in a mirrored package, then I contact the maintainer.

@ymherklotz
Copy link
Owner

Thanks a lot for this issue, I have merged back the commits now. I now know to manually merge everytime because github is just a mirror, the history should never be rewritten.

rockstorm101 added a commit to rockstorm101/emacs-zettelkasten that referenced this issue Aug 21, 2022
Upstream rewrote history a bit. Fast-forward merging not possible. See
[1] for context.

[1]: ymherklotz#9
@tarsius
Copy link
Author

tarsius commented Sep 12, 2022

Thanks!

@tarsius tarsius closed this as completed Sep 12, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants