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

ds-ga-1007 #14

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

ds-ga-1007 #14

wants to merge 11 commits into from

Conversation

pcw271
Copy link

@pcw271 pcw271 commented Oct 28, 2016

Assignment5_pcw271

@ds-ga-1007
Copy link
Owner

I am just letting you know that your repo has conflicts.
Conflicting files:
adventure/advent
adventure/adventure.py
adventure/data.py

@ds-ga-1007
Copy link
Owner

Conflicting files
adventure/advent
adventure/adventure.py
adventure/data.py
adventure/play.py

@ds-ga-1007
Copy link
Owner

Please resolve your conflicts. Please let me know if you have re-submitted.

@pcw271
Copy link
Author

pcw271 commented Nov 2, 2016

git revert -m

@pcw271
Copy link
Author

pcw271 commented Nov 2, 2016

Hi,
I tried to add some command to revert or fix the conflict part, but it does
not fix the conflict record there. Would you give me some instruction for
fix the conflict?
Thank you.

Pei-Chen

2016-11-01 13:04 GMT-04:00 ds-ga-1007 [email protected]:

Please resolve your conflicts. Please let me know if you have re-submitted.

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
#14 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/AQaeulldWT8VBxa_1UEYk1f_HWCkwvkGks5q53EzgaJpZM4KjK6b
.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@pcw271 @ds-ga-1007