Remote and local edit conflicts

ga-wdi-boston / git-github

Lesson to introduce Github, forking, cloning and synchronizing change between team members.

Other

0 stars 83 forks source link

Remote and local edit conflicts #8

Closed berziiii closed 8 years ago

berziiii commented 8 years ago

developer edits README.md on github
developer edits local file and commits
developer tries to push
error occurs

RealWeeks commented 8 years ago

@berziiii Can you clarify this issue and the purpose? Is it just to have them run into conflicts? This sounds like a class cluster**. Did it work when you tried it?

jrhorn424 commented 8 years ago

@berziiii What's the purpose of this? @payne-chris-r is blocked until we find out.

payne-chris-r commented 8 years ago

This should be fixed in latest commit.