From: Cheeray Huang <cheeray.huang@gmail.com>
To: Philip Oakley <philipoakley@iee.org>
Cc: git@vger.kernel.org
Subject: Re: Report a bug, about track remote repository.
Date: Sun, 21 Oct 2012 10:44:05 +0800 [thread overview]
Message-ID: <50836175.5020501@gmail.com> (raw)
In-Reply-To: <F15116C3B49A439AB06C8068F79E4C0F@PhilipOakley>
On 2012年10月21日 07:46, Philip Oakley wrote:
>
> At this point you have created the 'conflict' - You can't have two
> different branches that both track the same identical remote branch
> and expect that they can be both different and identical at the same
> time.
> Only one push (from two branches trying) can suceed. You either force
> the remote to match the current branch, and loose any information that
> it had about the other branch, or the remote stays with one branch.
> Simply don't do it [that way]. If the local branches are different,
> then you need distinct remote branches.
Yes, if it will lead a conflict, I think git should give a warning for
it and prevent these operations rather than give a comment to inform you
to push something.
--
Best Regards!
Qiyu Huang( Cheeray )
prev parent reply other threads:[~2012-10-21 2:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-20 18:49 Report a bug, about track remote repository Cheeray Huang
2012-10-20 23:46 ` Philip Oakley
2012-10-21 2:44 ` Cheeray Huang [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50836175.5020501@gmail.com \
--to=cheeray.huang@gmail.com \
--cc=git@vger.kernel.org \
--cc=philipoakley@iee.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).