From: Bruce Korb <bkorb@gnu.org>
To: GIT <git@vger.kernel.org>
Subject: Re: SUCCESS -- failed to push
Date: Mon, 01 Mar 2010 14:04:18 -0800 [thread overview]
Message-ID: <4B8C39E2.2050904@gnu.org> (raw)
In-Reply-To: <4B8C38E5.7090305@gnu.org>
Bruce Korb wrote:
>> In terms of recovering from your present situation I'd try the
>> following (Disclaimer: maybe you shouldn't try these based solely on
>> my advice. I'm still learning too)
>>
>> git pull
>> <resolve merge issue, 'git mergetool' is your friend>
>> git push
>>
>> I think this will basically sort things out but you may need to hand
>> hold a few things through a merge depending on how different the 2
>> commits are.
>
> I will be trying this procedure momentarily.
There were no resolution issues. "git pull ; git push" was sufficient.
Thank you all for your help! Regards, Bruce
next prev parent reply other threads:[~2010-03-01 22:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 21:15 failed to push Bruce Korb
2010-03-01 21:23 ` Bruce Korb
2010-03-01 21:42 ` Chris Packham
2010-03-01 22:00 ` Bruce Korb
2010-03-01 22:04 ` Bruce Korb [this message]
2010-03-02 11:44 ` Erik Faye-Lund
2010-03-02 19:09 ` Jakub Narebski
2010-03-02 21:36 ` Chris Packham
2010-03-02 23:07 ` [gitbook PATCH] add notes on re-writing history Chris Packham
2010-03-01 21:27 ` failed to push Jacob Helwig
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=4B8C39E2.2050904@gnu.org \
--to=bkorb@gnu.org \
--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).