feat: remove master branch, switch to git merge --ff-only #744
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rajivshah3
approved these changes
Jul 4, 2020
lucasfernog
added a commit
that referenced
this pull request
Jul 8, 2020
* fix: update rust docs PR needs a path (#742) It is being checked out in a subdir, so we need to give the PR a path to it. * chore(tauri.js) update changelog with window.tauri mapper (gist) * chore(tauri.js) run rollup with silent flag * chore(tauri): Resolve clippy warnings (#745) * chore(readme) update documentation link * fix(tauri.js) event payload type on TS API (#746) * chore(bundler) improve "running script" log (#747) * chore(changes) add bundler log improvement change file * Fix/includedir (#751) * fix(tauri) assets embedding regression * fix(tauri) fix & optimize embedded assets * fix: update docs with PAT (#743) * feat: remove master branch, switch to git merge --ff-only (#744) * feat: remove master branch, switch to git merge --ff-only * rename pr-to-latest.yml * feat(workflow) improve clippy check, add fmt and audit checks (#754) * fix(tauri.js) transpile TS API and fix cjs/esm export (#752) * Apply Version Updates From Current Changes (#748) Co-authored-by: lucasfernog <lucas@tauri.studio> * feat(tauri.js) validate tauri.conf.json schema on runtime (#756) * chore: Fix typo on minuscule (#765) Although this could be debated, "minuscule" seems to be the official spelling. Source: https://www.merriam-webster.com/dictionary/miniscule * fix: tauri past changelog had incorrect versions (#767) It appears that the crossover with tauri.js also led to skipping 0.6.1 tauri crate publish. * fix(tauri-bundler) appimage script (#766) * Apply Version Updates From Current Changes (#758) Co-authored-by: lucasfernog <lucas@tauri.studio> * fix(bundler) dmg `unbounded variable` issue (#770) * Apply Version Updates From Current Changes (#772) Co-authored-by: lucasfernog <lucas@tauri.studio> Co-authored-by: Jacob Bolda <me@jacobbolda.com> Co-authored-by: Rajiv Shah <rajivshah1@icloud.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Francois Best <francois@francoisbest.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What kind of change does this PR introduce? (check at least one)
Does this PR introduce a breaking change? (check one)
The PR fulfills these requirements:
devbranch and not themasterbranchfix: #xxx[,#xxx], where "xxx" is the issue number)If adding a new feature, the PR's description includes:
Other information:
I believe
git merge sha --ff-onlyshould work fine with how we use it. Any git aficionados know with more certainty?