Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update 01_代数-checkpoint.ipynb #601

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update 01_代数-checkpoint.ipynb #601

wants to merge 1 commit into from

Conversation

xja
Copy link
Contributor

@xja xja commented Jan 9, 2021

No description provided.

@xiaowuhu
Copy link
Collaborator

麻烦您resolve一下，目录名称有变化。

@xiaowuhu
Copy link
Collaborator

A1-的目录名称有变化，麻烦您再提交一下，谢谢

@xja
Copy link
Contributor Author

xja commented Feb 1, 2021

i'm not quite familiar with git, don't know how to resolve this kind of merge conflicts

@marko-polo-cheno
Copy link
Contributor

marko-polo-cheno commented May 18, 2021 •
edited
Loading

This is easy to fix. @xja
Copy the single line that you changed. Delete this pull request (or update this one). On your forked repo, fetch the latest updates.
Then paste the line back where you want it and resubmit a pull request.

github makes it easy to fix conflicts as well, but xja:patch-3 is out dated

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xiaowuhu xiaowuhu xiaowuhu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@xja @xiaowuhu @marko-polo-cheno