Resolve merge conflict in DeleteCommandParser #126
Merged
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
Rename app's version number for trial release
…15-2/documentation_1.3 Add schedule command to DG
Allow group command to take multiple groups
…dule Add more date formats for schedule
…15-2/add-schedule-command Add more data formats for schedule command
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## change-edit-command #126 +/- ##
=========================================================
+ Coverage 75.92% 75.98% +0.06%
- Complexity 561 562 +1
=========================================================
Files 84 84
Lines 1815 1820 +5
Branches 197 198 +1
=========================================================
+ Hits 1378 1383 +5
Misses 370 370
Partials 67 67 ☔ View full report in Codecov by Sentry. |
|
merge conflict seems to be able to be resolved with this commit. |
Ragnapop
merged commit 00fd262
into
AY2324S2-CS2103T-T15-2:change-edit-command
5 checks passed
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.
Linked to this #112, trying to resolve this merge conflict so that the code from change-edit-command can merge to master