Merging two git repositories together with Django web server, one developer -
i started django project locally , have been using git fine. i got ahead of myself , copied code server instantly became out of sync local version. hadn't done branch or anything. the 2 part question what's best structure me work locally, push/pull test server , update live server when test solid, , how setup i'm at? i've been developing no branches in these stages, i'd instead follow standard practices branching , merging. i'm using netbeans 6.8 locally coding , i've got gitx. integration tips helpful i'm comfortable doing whatever command lines necessary. thanks! james first should able have form of communication between git repositories you've got on local machine, test server , live server. git flexible in regard few of options are: have test , live server pull local repository. from development push test , live servers on appropriate times. from development push production , have test server pull production. ha...