From: "Magnus Bäck" <baeck@google.com>
To: ASHISH VERMA <ashunew1989@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: your mail
Date: Tue, 21 May 2013 09:13:35 -0400 [thread overview]
Message-ID: <20130521131334.GB634@google.com> (raw)
In-Reply-To: <CAED3JAZa8iB=rZqZ9sUfAqqtzHaMS3-6m0r=TnaBBRtYTF0XMw@mail.gmail.com>
On Friday, May 17, 2013 at 14:02 EDT,
ASHISH VERMA <ashunew1989@gmail.com> wrote:
> Hi, i am using git to push my code from eclipse to heroku , but
> recently iam getting error like::
>
> master:master rejected:non fast forward
>
> and i am not able to resolve it .I tried a git pull but that says -
> conflicts shud be resolved before git pull can be implemented.I can;t
> find the solution Please help ASAP...
Resolve the conflicts by either hand-editing the files (you'll see the
markers where the conflicts are) add running 'git add' to tell git that
you're done resolving them, or set up Git to use a graphical tool like
kdiff3. When you're done, run 'git commit' to create the merge commit.
After that you'll be able to push to your upstream (unless things have
moved again while you were resolving the initial conflict).
This guide to merge conflicts looks pretty good:
http://gitguru.com/2009/02/22/integrating-git-with-a-visual-merge-tool/
--
Magnus Bäck
baeck@google.com
next prev parent reply other threads:[~2013-05-21 13:13 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-17 18:02 (unknown), ASHISH VERMA
2013-05-21 13:13 ` Magnus Bäck [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-24 0:38 shejan shuza
2020-06-24 1:31 ` your mail brian m. carlson
2019-11-20 3:49 Han-Wen Nienhuys
2019-11-20 5:30 ` your mail Taylor Blau
2019-11-20 8:05 ` Christian Couder
2019-07-11 20:11 Robert Morgan
2019-07-11 20:18 ` your mail Kevin Daudt
2019-07-11 20:25 ` Robert Morgan
2019-01-25 9:47 Furkan DURUL
2019-01-25 11:27 ` your mail Kevin Daudt
2017-06-22 9:50 Jessie Hernandez
2017-06-22 12:48 ` your mail Simon Ruderich
2017-06-22 13:35 ` AW: " Patrick Lehmann
2017-06-22 13:47 ` Simon Ruderich
2017-06-22 13:55 ` AW: " Patrick Lehmann
2017-06-22 20:46 ` Simon Ruderich
2017-06-22 21:35 ` Junio C Hamano
2017-06-22 21:58 ` Ævar Arnfjörð Bjarmason
2017-06-22 22:14 ` Junio C Hamano
2017-06-22 23:21 ` Jeff King
2017-06-23 5:23 ` Junio C Hamano
2017-06-23 16:53 ` Jeff King
2017-06-23 18:44 ` Junio C Hamano
2017-06-23 6:58 ` demerphq
2016-04-11 19:04 (unknown), miwilliams
2016-04-11 19:13 ` your mail Jeff King
2012-05-06 14:17 (unknown), Bruce Zu
2012-05-06 17:04 ` your mail Marcus Karlsson
2008-08-13 14:54 (unknown), aneesh.kumar
2008-08-13 15:16 ` your mail Aneesh Kumar K.V
2007-12-05 19:00 [PATCH 0/6] builtin-remote Johannes Schindelin
2007-12-05 19:00 ` (unknown) Johannes Schindelin
2007-12-05 19:01 ` your mail Johannes Schindelin
2007-10-13 4:01 (unknown), Michael Witten
2007-10-13 4:07 ` your mail Jeff King
2006-11-21 22:24 (unknown) Johannes Schindelin
2006-11-22 20:16 ` your mail Davide Libenzi
2006-10-20 14:24 (unknown) andyparkins
2006-10-20 14:42 ` your mail Johannes Schindelin
[not found] <C8DBC54F2A9BAD4FA7F445CC7ADD963B0232474F@sslmexchange1.paymentech.us>
2006-09-26 19:56 ` Linus Torvalds
2006-05-21 23:53 (unknown) J. Bruce Fields
2006-05-21 23:55 ` your mail J. Bruce Fields
2006-05-22 0:16 ` Junio C Hamano
2006-05-22 1:33 ` J. Bruce Fields
2005-10-05 6:10 (unknown), Willem Swart
2005-10-06 10:52 ` your mail Elfyn McBratney
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=20130521131334.GB634@google.com \
--to=baeck@google.com \
--cc=ashunew1989@gmail.com \
--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.
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).