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

Pull request related to [Issue 298 - Change of actual Recurrence Rule Class] #400

Closed
wants to merge 5 commits into from

Conversation

GoldenSoju
Copy link
Contributor

@thomassth
Copy link
Contributor

It seems strange to have this many lines changed

Maybe try a fast forward merge?

@GoldenSoju
Copy link
Contributor Author

@thomassth
Sorry, but regarding fast forward merge, would you mind telling me how to do it the best way? This SO question doesn't really clarify it for me.

@thomassth
Copy link
Contributor

There's no button on github that does that unfortunately

In my workflow (VSCode), I use Git Graph:

  1. add the main repo in a separate branch (there's a setting in Git graph, or you can do that with command line)
  2. pick "merge to current branch" at the latest commit
  3. uncheck the first option so that it will do a fastforward merge

Or you can just git push cause it does fastforward by default.

@thomassth
Copy link
Contributor

Also, may I ask what was changed in your rrule? If it's ready, you should submit a PR over there too. Or else we may need to put it into our package somehow.

@GoldenSoju GoldenSoju mentioned this pull request Jan 5, 2022
9 tasks
@GoldenSoju
Copy link
Contributor Author

@thomassth

  1. Please check the new pull request 403.
  2. Most notable changes to Rrule were:
  • adding toJson/fromJson functions
  • some utility functions (like: Frequency to Int / Int to Frequency)
  • some changes that you also commited (removed deprecated/not needed packages etc.)
  • renamed Frequency to RecurrenceFrequency

Please see also this change report.

@thomassth
Copy link
Contributor

Closing this since we have #403 now.

@thomassth thomassth closed this Jan 5, 2022
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.

2 participants