git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Gray King <grayking.w@gmail.com>
To: git@vger.kernel.org
Subject: Lost changes after merge
Date: Mon, 29 Oct 2018 09:49:20 +0100	[thread overview]
Message-ID: <CAP1N1j7P83XVPx6dDGMSeRbwjdixAdBNZab=TP94=9LSfmsrRQ@mail.gmail.com> (raw)

Hello,

  I have a very strange issue described below:

* Here is the tree before I merge via `git log --format="%h %p %d" -n
20 --all --graph`:

https://upaste.de/9Pe

* Here is the output of `git log --format="%h %p %d" -2 path/to/file`:

a008c4d580 c61f96eb5d
a274b6e7ca 67c1000ca3

* Here is the merge commands:

git merge f087081868
# fix conflicts

* Here is the tree after I merged via `git log --format="%h %p %d" -n
20 --all --graph`:

https://upaste.de/8Bx


* Here is the output of `git log --format="%h %p %d" -2 path/to/file`:

a274b6e7ca 67c1000ca3
67c1000ca3 00bd5c8c89

             reply	other threads:[~2018-10-29  8:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-29  8:49 Gray King [this message]
2018-10-29  8:51 ` Lost changes after merge Gray King
2018-10-29 14:18 ` Jeff King
2018-10-30  2:46   ` Gray King
2018-10-30 15:29     ` Rafael Ascensão
2018-10-31 15:30     ` Brandon McCaig

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='CAP1N1j7P83XVPx6dDGMSeRbwjdixAdBNZab=TP94=9LSfmsrRQ@mail.gmail.com' \
    --to=grayking.w@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).