Hello everyone,

I'm a new user of git, trying to push to remote repo with working copy attached to it. I DO want the remote files to be overwritten. According to FAQ


http://git.wiki.kernel.org/index.php/GitFaq#push-is-reverse-of-fetch

http://thread.gmane.org/gmane.comp.version-control.git/42506/focus=42685

I configured:

remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=r...@remote:/var/www/html/.git
remote.origin.push=refs/heads/*:refs/remotes/B/*
branch.master.remote=origin


Then I do 'git push' on local machine:

Counting objects: 5, done.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 286 bytes, done.
Total 3 (delta 2), reused 0 (delta 0)
To r...@remote:/var/www/html/.git
   2f800b1..d709d6d  master -> B/master

OK for now.

But then according to the FAQ I do on the 'remote':

# git merge remotes/B/master

Updating 2f800b1..d709d6d
error: Entry 'hostdeleted.mako' would be overwritten by merge. Cannot merge.

That should do it according to FAQ but doesn't.

Overwriting the file local to 'remote', both in .git repo and in the filesystem is precisely what I want!

Anybody knows how to make git to merge the changes (obviously not if there are conflicts)?

Regards,
mk

--
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-us...@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to