Hi folks

I have the following scenario:
- local stage for personal development
- github to keep the master (always doing a push origin master after
commiting things)
- acceptance test instance on a dev server (I use a pull github master
to refresh this stage)
- prod server which will be refreshed by capistrano from github

locally everything works perfect, the deployment to production too,
but the pull to dev server gives me a conflict saying that all
modified files need rework.
Looking to the listed files gives me HEAD in and HEAD out

What is wrong? Do I need to modify all files again on dev server? or
do I have to do everytime a commit on dev after successful pull from

Are there other (better) strategies to have a dev server in the middle
of github and prod server?

Thanks in advance

You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 

Reply via email to