public inbox for archer@sourceware.org
 help / color / mirror / Atom feed
From: Joel Brobecker <brobecker@adacore.com>
To: Pierre Muller <pierre.muller@ics-cnrs.unistra.fr>
Cc: archer@sourceware.org
Subject: Re: [Archer] Remote repository and git push command
Date: Wed, 09 Mar 2011 10:44:00 -0000	[thread overview]
Message-ID: <20110309104340.GN19402@adacore.com> (raw)
In-Reply-To: <000001cbde44$fb9fd710$f2df8530$@muller@ics-cnrs.unistra.fr>

>   If I make change to my branch, but also want to rebase my branch to
>   current HEAD, I get a warning about "loosing history" when I try to
>   push the new version onto the remote repository.

That's the disadvantage of using rebase.  Rebase is great because
it keeps the history linear.  But the downside is that it makes it
more difficult for others to track and make changes on top of your
branch.

> It is allowed to force the push in that case or how should I proceed
> to avoid the "losing history" complaint.

I don't know what the policy is on the Archer branch, or whether
there is one or not.

Given that you are doing the work using git mostly to be able to
maintain a set of patches, I think that you would really benefit
from using rebasing, rather than merging.  As there is no one
else pushing changes on that branch, it shouldn't have any impact
on anyone else.

Anyone more actively maintaining the Archer repo should be able
to give you the final OK (or not).

-- 
Joel

  reply	other threads:[~2011-03-09 10:44 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-09 10:30 Pierre Muller
2011-03-09 10:44 ` Joel Brobecker [this message]
2011-03-10 21:51   ` [Archer] " Tom Tromey
2011-03-11 10:32     ` Pierre Muller
2011-03-11 11:35       ` Jan Kratochvil

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=20110309104340.GN19402@adacore.com \
    --to=brobecker@adacore.com \
    --cc=archer@sourceware.org \
    --cc=pierre.muller@ics-cnrs.unistra.fr \
    /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 read-only IMAP folder(s) and NNTP newsgroup(s).