-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
stdout: CONFLICT (file location): tests/data_filter/filter_icon_overlay.test.ts added in a991661 ([MOV] filter_icon_overlay: move tests to correct folder) inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to tests/table/filter_icon_overlay.test.ts. stderr: 11:27:58.266038 git.c:463 trace: built-in: git cherry-pick a991661 error: could not apply a991661... [MOV] filter_icon_overlay: move tests to correct folder hint: After resolving the conflicts, mark them with hint: "git add/rm <pathspec>", then run hint: "git cherry-pick --continue". hint: You can instead skip this commit with "git cherry-pick --skip". hint: To abort and get back to the state before "git cherry-pick", hint: run "git cherry-pick --abort". ---------- status:
- Loading branch information
1 parent
1285168
commit 2199140
Showing
4 changed files
with
55 additions
and
6 deletions.
There are no files selected for viewing
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
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
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
File renamed without changes.