search

sr320 / course-fish546-2016

6 stars 5 forks source link

git merge conflict #66

Closed nclowell closed 7 years ago

nclowell commented 7 years ago

I've resolved a few merge conflicts by syncing from the desktop Github, but the current merge conflict won't resolve that way. I can't seem to push or pull from the command line, and cloning from github.com or syncing from the desktop isn't changing anything. Any other ways to resolve merge conflicts?

sr320 commented 7 years ago

Can you show the error the desktop app is giving you?

And the command line info?

On Thu, Oct 27, 2016 at 3:31 PM nclowell notifications@github.com wrote:

I've resolved a few merge conflicts by syncing from the desktop Github, but the current merge conflict won't resolve that way. I can't seem to push or pull from the command line, and cloning from github.com or syncing from the desktop isn't changing anything. Any other ways to resolve merge conflicts?

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/sr320/course-fish546-2016/issues/66, or mute the thread https://github.com/notifications/unsubscribe-auth/AEPHtzYiHC3IC6m7ajLF0zDtDWB2k2ixks5q4SYcgaJpZM4Ki5Q5 .

nclowell commented 7 years ago

I ended up solving my problem by uploading what I wanted to Github manually and cloning the whole thing back down. But thanks!