Skip to content

ds-ga-1007#14

Open
pcw271 wants to merge 11 commits intods-ga-1007:masterfrom
pcw271:master
Open

ds-ga-1007#14
pcw271 wants to merge 11 commits intods-ga-1007:masterfrom
pcw271:master

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 notifications@github.com:

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants