From: "jenny w" <veganjenny@gmail.com>
To: git@vger.kernel.org
Subject: Problems reverting (includes reverting a merge)
Date: Thu, 5 Jun 2008 10:45:55 -0700 [thread overview]
Message-ID: <b1d95faa0806051045t67ea0f46r55cdaeb794dc2f5c@mail.gmail.com> (raw)
Someone made a few commits that I'm trying to revert. There are three
commits in a row, the middle of which is a merge. There are presently
no commits following the ones that we want to revert.
I tried git revert on the latest commit and that worked fine.
The second latest commit was a merge, so I had to use the -m switch.
I'm not exactly sure what the parent-number refers to, so I created a
separate branch to try things out. Since it expects I a number, I
started from 1. That was kind of a disaster, so I deleted my branch
and made another off of master, and then tried doing the same command
with -m 2. This worked fine. However ...
I then tried to revert the next commit. This said there's a conflict.
Since there are no other commits after the ones I'm trying to revert,
this makes me think I'm doing something wrong ... shouldn't it just be
able to roll back?
What I'd really like to do is just zap the last 3 commits ... is there
another way to just make things the way they were before these patches
were applied?
Any help with any of the above would be greatly appreciated!
next reply other threads:[~2008-06-05 17:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-05 17:45 jenny w [this message]
2008-06-09 8:05 ` Problems reverting (includes reverting a merge) Andreas Ericsson
2008-06-09 9:00 ` Alex Bennee
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=b1d95faa0806051045t67ea0f46r55cdaeb794dc2f5c@mail.gmail.com \
--to=veganjenny@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.
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).