Error handling conflicts again #109
Open
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
* Add leaks and vunerability checks * Requires secrets now * Renamed interface as it's useful own it's own. Made it public. Added a comment * Some suggestions, this could be improved still. * Version bump required by this change. * 19 too fails. * Should be able to distinguish unset from invalid time properties * Improve error for property not found Co-authored-by: Arran Ubels <arran4@gmail.com> * Remove deprecated ioutil * Move targeted Go version to 1.20 And test the target forever * Add method to remove property Fixes #95 * Merged * New tool * Test fixed. * Fixed test failure. (Error wrapping needed to be considered in EOF checks.) * %s => %w fixes and an additional error. --------- Co-authored-by: Bracken Dawson <abdawson@gmail.com> Co-authored-by: Daniel Lublin <daniel@lublin.se>
* master: (23 commits) refactor: rename unused arg as '_' refactor: use consistent receiver names refactor: prefer switch for readability refactor: use ReplaceAll refactor: rename var to reflect what it is refactor: remove unnecessary named return values, harmonizing code base Minor update Rename default.md to pull_request_template.md Create default.md Create other.md Create bug.md Reintegration of #67 New tool Merged Add method to remove property Move targeted Go version to 1.20 Remove deprecated ioutil Improve error for property not found Should be able to distinguish unset from invalid time properties fix: omit zone in "AllDay" event helpers ... # Conflicts: # .github/workflows/test.yml # calendar.go # components.go # components_test.go # errors.go
* master: Duplication issue fixed. Test fixed. Resynced and moved some functions around #78 added functionnal option pattern for url parsing usage example, README calendar parsing url support # Conflicts: # calendar_test.go
Open
* master: Merge remote-tracking branch 'origin/master' into issue97 Some multiple-ness. Fix Some larger upgrades. Tests added. # Conflicts: # calendar_test.go # components.go
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.
My conflict resolution for PR: #73 in case my PR to PR isn't merged: ManoloTonto1#2
Although I feel like I should run with this one just to get it across the line. The conflict potential of this PR is massive.