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

iOS fixes; rebasing null release #302

Closed
wants to merge 2 commits into from

Conversation

thomassth
Copy link
Contributor

Fixing issues referenced in #213, should reduce related errors pop up
Also fixed example app where it forget to check if it really had calendar permission (should be related to an issue but can't find it now?)

Also completed a rebase with upstream.
Using methods mentioned in git doc:

  1. git pull Pull upstream into a separate branch
  2. git rebase with the upstream branch
  3. Tinker until you get a single branch, note the commit ID should follow upstream, otherwise nothing is changed.
  4. git push --force your result

Git doc also suggested git pull --rebase but I couldn't figure that out.

If this keeps happening maybe I'll write contribute.md. Or just don't do this in a public git.

@nickrandolph
Copy link
Contributor

@thomassth happy for contribute.md to include how to rebase. The need to rebase is quite common to ensure PRs merge cleanly without side effects. Just a note that we don't rebase develop, master, release or hotfix (unless we really have to). However, when we merge PRs in to develop, we use the rebase and merge option to keep the commit history clean

@thomassth thomassth closed this May 11, 2021
@thomassth thomassth deleted the branch builttoroam:develop May 11, 2021 09:28
@thomassth thomassth deleted the develop branch May 11, 2021 09:28
This was referenced May 11, 2021
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