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

fix(fs): Fix DebouncedEvent type to match what notify-rs returns #848

Merged
merged 2 commits into from
Dec 27, 2023

Conversation

fitztrev
Copy link
Contributor

Same fix as #840 this time to the v2 branch

@fitztrev fitztrev requested a review from a team as a code owner December 22, 2023 00:42
@amrbashir
Copy link
Member

Thanks for your contributions, could you add a change file in .changes directory?

@fitztrev fitztrev force-pushed the fix-debounced-event-type branch from c79bdc7 to a5c9d01 Compare December 22, 2023 02:13
@fitztrev fitztrev changed the title fix(fs-watch): Fix DebouncedEvent type to match what notify-rs returns fix(fs): Fix DebouncedEvent type to match what notify-rs returns Dec 22, 2023
@fitztrev fitztrev force-pushed the fix-debounced-event-type branch from a5c9d01 to f9e6a3f Compare December 22, 2023 15:10
@FabianLars
Copy link
Member

Hi, since this was fixed on the v1 branch I typically just merge v1 into v2 to sync it, so this pr would probably just cause merge conflicts (and a duplicate commit) :)

I didn't have the time to do that yet but can do it once I'm home today or tomorrow :)

@amrbashir
Copy link
Member

This shouldn't introduce a conflict since v1 is under fs-watch not fs directory so I think it is fine to merge.

@amrbashir amrbashir merged commit 85f8419 into tauri-apps:v2 Dec 27, 2023
7 checks passed
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.

3 participants