new FindCommand #86
Merged
new FindCommand #86
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
… and also add addition testcases for finding supplier and tags
saad-haider-pp
previously approved these changes
Oct 5, 2020
|
@halcon-blanco my bad, I was doing it on a branch initially but accidentally merge to master when I wanted to transfer my work to be done on another computer. Will be more careful next time |
|
@zeranium97 there's conflicting files, just rebase your commits and we'll review again 👍 |
|
By the way, the conflicts came because of my PR which just got merged, so just keep that in mind haha don't throw everything out |
# Resolved Conflicts: # src/main/java/seedu/address/logic/commands/EditCommand.java # src/test/java/seedu/address/logic/commands/FindCommandTest.java # src/test/java/seedu/address/logic/parser/InventoryBookParserTest.java # src/test/java/seedu/address/model/ModelManagerTest.java # src/test/java/seedu/address/model/item/NameContainsKeywordsPredicateTest.java
|
@Wincenttjoi @halcon-blanco I have resolved the conflict, please check, not sure if I did it the right way |
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.
allows find command to be able to search by name, supplier and tags