git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andy Hawkins <andy@gently.org.uk>
To: git@vger.kernel.org
Subject: Re: Urgent: Issue with GIT ...
Date: Mon, 25 Jun 2012 13:02:37 +0000 (UTC)	[thread overview]
Message-ID: <slrnjugobd.8ie.andy@atom.gently.org.uk> (raw)
In-Reply-To: 1340624980925-7562097.post@n2.nabble.com

Hi,

In article <1340624980925-7562097.post@n2.nabble.com>,
           guruprasad<guruprasadkinI@gmail.com> wrote:
> 5) If i do some changes to files in B, commit and push to remote branch, I
> am unable to pull the changes done and merge into A. I have set
> "receive.denycurrentbranch=ignore" in git config.

Sounds like you're trying to push into a remote non-bare repository.

What I'd do is:

1. On 'A', create a bare repository.
2. Somewhere else on 'A', clone this repository. Work and push to the bare
in step 1 when necessary.
3. On 'B', also clone the repository from 1. Work and push to the bare when
necessary.

I don't think it's a good idea to push to a repository that has checked out
files. I seem to remember this being mentioned in Pro Git.

Andy

  parent reply	other threads:[~2012-06-25 14:45 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-25 11:49 Urgent: Issue with GIT guruprasad
2012-06-25 12:07 ` Konstantin Khomoutov
2012-06-25 12:55   ` guruprasad
2012-06-25 13:05     ` jaseem abid
2012-06-25 13:14     ` Angus Hammond
2012-06-25 13:29     ` Konstantin Khomoutov
2012-06-25 13:02 ` Andy Hawkins [this message]
2012-06-26  6:08   ` Kevin
2012-06-26  7:58     ` Andy Hawkins
2012-06-26  9:01       ` Kevin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=slrnjugobd.8ie.andy@atom.gently.org.uk \
    --to=andy@gently.org.uk \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).