On Sunday, August 18, 2013 6:13:38 PM UTC-4, Jim Toth wrote: > > There are a few ways to go; probably the best way is to set up a bare > repository that you push and pull from in both places, but I'd probably add > the development environment as a remote in the in-production directory. > > cd /path/to/production/repository > git remote add devel /path/to/development/directory > git merge --ff-only devel/master > > (--ff-only because I'm paranoid -- that will give you the same sort of > warnings that "git push" would give you if you the trees had diverged). >
So you're saying adding to the development environment as a remote in the in-production directory is an alternative to using a bare repository then? I'm new to git and just trying to find an easy way, if using bare repositories is necessary, I don't think git is very good for this at all, its too much trouble for what its worth. (except for extremely large environments, which is rare) -- You received this message because you are subscribed to the Google Groups "Puppet Users" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/puppet-users. For more options, visit https://groups.google.com/groups/opt_out.
