You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
@AprilYUZhang
There are too many changes that the web editor does not support the conflict resolution here. For me to do that, I probably need to first fork your repository and then submit a pull request to your branch on your repository, which, if you later accept, would be able to add here. This is quite complicated. Also, since I won't be able to access the conflicts directly, I won't be able to merge them here. I can only provide change suggestions. So, I think it is still better for you to resolve the conflicts.
Or another way is that I create a new branch from the earlier commit of this repository, and then you create a pull request to that branch. In this way, you can first push to that branch and then leave the conflict resolution for later.
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.
No description provided.