Feat/merge conflict #161
Open
Feat/merge conflict #161
Conversation
This file contains hidden or 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
![graphite-app[bot]](https://avatars.githubusercontent.com/in/158384?s=60&v=4){kind=small}
|
|
||
| try { | ||
| await merge({ title, contents: str, version: data.lastVersion }); | ||
| toast(<Toastify content="출동이 해소되었습니다!" />); |
There was a problem hiding this comment.
There appears to be a typo in the success message. The text 출동이 해소되었습니다! (which translates to "dispatch has been resolved") should be 충돌이 해소되었습니다! (which correctly translates to "conflict has been resolved").
Suggested change
| toast(<Toastify content="출동이 해소되었습니다!" />); | |
| toast(<Toastify content="충돌이 해소되었습니다!" />); |
Spotted by Diamond
Is this helpful? React 👍 or 👎 to let us know.
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.
Issue Number
What
문서 충돌 발생시 해결하기 위한 컴포넌트를 구현했습니다.
추후 리팩터링 작업이 필수입니다~~
반복되는 코드에 대한 부분은 코멘트 달지 않으셔도 될듯합니다~~
How
ScreenShot
디자인 이슈는 요청시 해결될 수 있습니다. ux는 괜찮은거 아닐까요...?