Skip to content

Fix duplicate task on reboot#2902

Merged
eikek merged 1 commit intoeikek:masterfrom
tiborrr:fix-duplicate-task-on-reboot
Jan 16, 2025
Merged

Fix duplicate task on reboot#2902
eikek merged 1 commit intoeikek:masterfrom
tiborrr:fix-duplicate-task-on-reboot

Conversation

@tiborrr
Copy link
Copy Markdown
Contributor

@tiborrr tiborrr commented Dec 30, 2024

closes #2901

@tiborrr tiborrr force-pushed the fix-duplicate-task-on-reboot branch from 3fcd843 to c10c3eb Compare December 30, 2024 08:39
@tiborrr
Copy link
Copy Markdown
Contributor Author

tiborrr commented Dec 30, 2024

@pschichtel
Copy link
Copy Markdown
Contributor

why did you include all the dependency updates here?

@tiborrr
Copy link
Copy Markdown
Contributor Author

tiborrr commented Jan 8, 2025

This happens when you sync your fork with the current master branch. I have to say I don't like it either, but wanted to make sure that it worked with the latest version. I can also remove these I guess.

@eikek
Copy link
Copy Markdown
Owner

eikek commented Jan 8, 2025

@tiborrr when you pull in the master branch, you could use the --rebase option, which puts your changes on top of the new ones pulled from the remote. Imho it is a bit more convenient, when changes get pushed on the main repo

@tiborrr
Copy link
Copy Markdown
Contributor Author

tiborrr commented Jan 8, 2025

Will try to fix this branch. Thanks for the advise!

@tiborrr tiborrr force-pushed the fix-duplicate-task-on-reboot branch from c10c3eb to 8ad32ba Compare January 13, 2025 09:34
@tiborrr
Copy link
Copy Markdown
Contributor Author

tiborrr commented Jan 13, 2025

I have fixed the branch. Good practice for my git rebase :)

@tiborrr
Copy link
Copy Markdown
Contributor Author

tiborrr commented Jan 16, 2025

@eikek can you merge this one?

@eikek eikek added the fix label Jan 16, 2025
@eikek eikek merged commit 794f551 into eikek:master Jan 16, 2025
@eikek
Copy link
Copy Markdown
Owner

eikek commented Jan 16, 2025

Sorry @tiborrr thanks for pinging!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Docspell gets stuck on reboot because docspell is trying to insert duplicate housekeeping tasks

3 participants