From: Sylvain Rabot <sylvain@abstraction.fr>
To: git@vger.kernel.org
Subject: Re: How to ignore changes on remote
Date: Tue, 23 Mar 2010 15:07:15 +0100 [thread overview]
Message-ID: <1269353235.14299.0.camel@kheops> (raw)
In-Reply-To: <26ae428a1003230654m50c35caci4a02e2df321f289c@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
On Tue, 2010-03-23 at 13:54 +0000, Howard Miller wrote:
> My remote branch has changes that are not fast forward (I forgot to
> merge). I have now made incompatible changes on my local branch. I
> simply want to use the local version and push it to the remote. I
> don't care about the remote version. I don't want to merge as there'll
> be loads of conflicts and the answer will always be 'use the local
> one'. Is there an easy way to do this? I can't think of anything.
>
> Cheers!
git push origin +local_branch:remote_branch
--
Sylvain Rabot <sylvain@abstraction.fr>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2010-03-23 14:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-23 13:54 How to ignore changes on remote Howard Miller
2010-03-23 14:07 ` Sylvain Rabot [this message]
2010-03-23 14:13 ` Howard Miller
2010-03-23 14:21 ` Alexander Iljin
2010-03-23 14:22 ` Santi Béjar
2010-03-23 14:24 ` Howard Miller
2010-03-23 14:25 ` Sylvain Rabot
2010-03-23 16:05 ` Scott Chacon
2010-03-23 16:13 ` Howard Miller
2010-03-23 16:20 ` Johannes Sixt
2010-03-23 17:20 ` Johan Herland
2010-03-23 17:47 ` Jakub Narebski
2010-03-23 18:02 ` Johan Herland
2010-03-23 16:44 ` Junio C Hamano
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=1269353235.14299.0.camel@kheops \
--to=sylvain@abstraction.fr \
--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).