/casher 指名欄を作る #187
Merged
/casher 指名欄を作る #187
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
|
@Astalum |
|
今回は自分で conflict 解消をやってみましょう。 git fetch origin main
git merge mainを実行すると、コンフリクトが発生して staged files にそのファイルたちが表示されます。 その状態でいい感じに package.json を resolve してやる（やりかたはいろいろあるので調べてみて） わからなくなったらまた教えてください。 |
|
Visit the preview URL for this PR (updated for commit c91948b): https://cafeore-2024--pr187-issue-177-lt5zzia3.web.app (expires Fri, 11 Oct 2024 04:30:37 GMT) 🔥 via Firebase Hosting GitHub Action 🌎 Sign: b62dcde668e26b6280dd8317f3f875013f6f22f5 |
toririm
requested changes
Oct 3, 2024
package.json
Outdated
| @@ -20,7 +20,8 @@ | |||
| "@radix-ui/react-alert-dialog": "^1.1.2", | |||
| "@radix-ui/react-icons": "^1.3.0", | |||
| "@radix-ui/react-label": "^2.1.0", | |||
| "@radix-ui/react-radio-group": "^1.2.1", | |||
| "@radix-ui/react-radio-group": "^1.2.0", | |||
There was a problem hiding this comment.
バージョンを落とす必要はないので、mainと同様のバージョンに戻してください。
また、bun install を実行して bun.lockb にも反映させてください。
Suggested change
| "@radix-ui/react-radio-group": "^1.2.0", | |
| "@radix-ui/react-radio-group": "^1.2.1", |
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.
fix #177