I would just create the bare repository, and then push to it. It's pretty straight forward, something like:
mkdir project.git cd project.git/ git init --bare Then go to where ever you have an up-to-date branch in a repository git push somemachine:/path/to/git/repos/project.git master you should definitely be using git with capistrano instead of copying working directories, yikes when people push seperately, they have some options. The most straight forward is to do a pull before doing a push. That way it merges any commits that you're missing. Even better is to use rebase so that it always looks like a fast-forward push (ie, your history isn't full of merges that exist solely to get the lastest changes since your last pull.) you'll probably have to read up on some of these concepts. On Mon, Dec 15, 2008 at 7:18 PM, giorgio <[email protected]> wrote: > > Thanks for that Miles. > > I had seen stuff about 'bare repositories' but didn't know what they > were. > > Does an auto merge happen if two people push separately? > > Can I convert my server repo to a bare repository or should start > again? > > Might have to change my Capistrano deploy as currently it does a file > copy from the repo folder rather than via git.... > > G. > > > > --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
