From: "Toralf Förster" <toralf.foerster@gmx.de>
To: trinity@vger.kernel.org
Subject: git issue
Date: Wed, 1 Jul 2015 15:37:48 +0200 [thread overview]
Message-ID: <5593ED2C.50705@gmx.de> (raw)
got today :
$ cd ~/devel/trinity; git pull
U blockdevs.c
U debug.c
U rand/random-pathname.c
U rand/random.c
U shm.c
U tools/analyze-sockets.c
U uid.c
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution and make a commit.
tfoerste@t44 ~/devel/trinity $ git diff
tfoerste@t44 ~/devel/trinity $ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 3702 and 3711 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
You have unmerged paths.
(fix conflicts and run "git commit")
Unmerged paths:
(use "git add <file>..." to mark resolution)
both added: blockdevs.c
both added: debug.c
both added: rand/random-pathname.c
both added: rand/random.c
both added: shm.c
both added: tools/analyze-sockets.c
both added: uid.c
no changes added to commit (use "git add" and/or "git commit -a")
tfoerste@t44 ~/devel/trinity $ git diff | patch -R
patch: **** Only garbage was found in the patch input.
tfoerste@t44 ~/devel/trinity $ git diff
tfoerste@t44 ~/devel/trinity $
/me ownders how to solve this - I did not edit loally files AFAICT
--
Toralf
pgp key: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 0076 E94E
next reply other threads:[~2015-07-01 13:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-01 13:37 Toralf Förster [this message]
2015-07-01 14:21 ` git issue Dave Jones
2015-07-01 15:11 ` Toralf Förster
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=5593ED2C.50705@gmx.de \
--to=toralf.foerster@gmx.de \
--cc=trinity@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 read-only IMAP folder(s) and NNTP newsgroup(s).