Hi, Can someone answer a couple of Git questions that are puzzling me? I have a repo on my Linux Server I 'git clone' the repo on my laptop (xp) I do some stuff I do a 'git add .' and a 'git commit -m "some comment"' I do a 'git push' to the remote origin (Linux server)
Here is where it gets confusing... On the Linux repo the "index" is updated but not the "working tree" I have to do a 'git reset --hard' in order to see the laptop changes on the server. The question (finally) is: what do I do if several people are trying to push to the server?. I cant do a reset --hard as I will lose any changes somebody else has made. What happens on GitHub when several people push to a repo? I cant seem to find anything in the doco. Doing a pull or fetch/merge from the remote repo seems to be the recommended method but GitHub appears to use 'pushes'. Can anyone enlighten me or point me at some articles that may help. Thanks George --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/rubyonrails-talk?hl=en -~----------~----~----~----~------~----~------~--~---
