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

Replace "macos" with "app-close" plugin #750

Merged
merged 1 commit into from
Mar 17, 2024
Merged

Conversation

uklotzde
Copy link
Contributor

Fixes the build on Linux (and probably Windows).

@martpie martpie changed the base branch from pr748 to tauri March 16, 2024 21:46
@martpie
Copy link
Owner

martpie commented Mar 16, 2024

Due to force-pushes, I think there are conflicts here. Could you maybe just rebase on top tauri and ignore aa1b762 ?

Sorry, that's due to me using Sapling SCM for managing my work, and it does not work well in a collaborative environment with GitHub.

@uklotzde
Copy link
Contributor Author

Sorry, that's due to me using Sapling SCM for managing my work, and it does not work well in a collaborative environment with GitHub.

Then GitHub is probably the wrong platform for collaboration? I also noticed the weird structure of this repo.

@martpie
Copy link
Owner

martpie commented Mar 17, 2024

Great job, thank you for that!

Then GitHub is probably the wrong platform for collaboration

Yesn't. GitHub is working fine, it's just I was working alone on the Tauri port, so I just was using my own sauce and experimenting with sapling.

Now we have a Dev branch named tauri, I can still make messes in my own side-branches, and we can consider the tauri branch "stable" (more or less), or at least, "the one we should merge other branches into".

I also noticed the weird structure of this repo.

is it haha?

@martpie martpie merged commit e27d5a2 into martpie:tauri Mar 17, 2024
@uklotzde
Copy link
Contributor Author

is it haha?

At least in git gui the branch structures look confusing. Unhandy if you want to quickly browse the recent history.

@uklotzde uklotzde deleted the app-close branch March 17, 2024 11:16
@martpie
Copy link
Owner

martpie commented Mar 17, 2024

Right, let me clean up a few branches ;) the pr-xxx come from Sapling, as Sapling considers branches an implementation details, and only the commit messages are important.

martpie pushed a commit that referenced this pull request Jun 13, 2024
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.

None yet

2 participants