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). -- Jim Toth On Sun, Aug 18, 2013 at 2:36 PM, me 1 <[email protected]> wrote: > On Sunday, August 18, 2013 3:24:40 AM UTC-4, James Polley wrote: >> >> The changes are being commited in the branch called "master" in your >> local checkout, but not being pushed nack up to the origin. >> >> http://git-scm.com/book/en/**Git-Basics-Working-with-**Remotes<http://git-scm.com/book/en/Git-Basics-Working-with-Remotes>explains >> how to push your changes. >> > > > Thanks, but I tried this already, but i'm still having errors: > > $ git push > Counting objects: 5, done. > Compressing objects: 100% (3/3), done. > Writing objects: 100% (3/3), 308 bytes, done. > Total 3 (delta 2), reused 0 (delta 0) > Unpacking objects: 100% (3/3), done. > remote: error: refusing to update checked out branch: refs/heads/master > remote: error: By default, updating the current branch in a non-bare > repository > remote: error: is denied, because it will make the index and work tree > inconsistent > remote: error: with what you pushed, and will require 'git reset --hard' > to match > remote: error: the work tree to HEAD. > remote: error: > remote: error: You can set 'receive.denyCurrentBranch' configuration > variable to > remote: error: 'ignore' or 'warn' in the remote repository to allow > pushing into > remote: error: its current branch; however, this is not recommended unless > you > remote: error: arranged to update its work tree to match what you pushed > in some > remote: error: other way. > remote: error: > remote: error: To squelch this message and still keep the default > behaviour, set > remote: error: 'receive.denyCurrentBranch' configuration variable to > 'refuse'. > To /etc/puppet/environments/preprod/../../../puppet > ! [remote rejected] master -> master (branch is currently checked out) > error: failed to push some refs to > '/etc/puppet/environments/preprod/../../../puppet' > > -- > 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. > -- Jim Toth [email protected] Applications Analyst, Technology Services (804) 827-1227 -- 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.
