From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Subject: Re: branch rebase and push
Date: Tue, 19 Dec 2006 10:57:35 +0100 [thread overview]
Message-ID: <em8cti$nff$1@sea.gmane.org> (raw)
In-Reply-To: 45875EFC.5090408@gmail.com
SungHyun Nam wrote:
> Can I push a branch after rebase?
> I got a error message:
> error: remote 'refs/heads/br' is not a strict subset of local ref
> 'refs/heads/br'. maybe you are not up-to-date and need to pull first?
>
> It worked fine if I did:
> $ git checkout -b br
> $ git pull . master
> $ git checkout master
> $ git pull
> $ git push
>
> But I got above error message if I did:
> $ git checkout br
> $ git rebase master
> $ git checkout master
> $ git pull
> $ git push
The problem you have is with _push_, not branch, I think.
Does repository you pull from has rebased branch 'br'? If yes, is it
pulled with + in pull/fetch line? Perhaps (but read documentation first,
please) "git push --force" is what you want, provided that other side
doesn't forbid non fast-forward pushes.
Bu you usually don't rebase published branch (don't change history
of published branch). Equivalently, you don't publish rebased branch
until it is ready (or merged in ;-).
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-19 9:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-19 3:39 branch rebase and push SungHyun Nam
2006-12-19 9:57 ` Jakub Narebski [this message]
[not found] ` <4587BD31.9030804@gmail.com>
2006-12-19 11:58 ` Jakub Narebski
2006-12-19 12:13 ` Johannes Schindelin
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='em8cti$nff$1@sea.gmane.org' \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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