From: Jens Kubieziel <kubieziel@googlemail.com>
To: git@vger.kernel.org
Subject: Resolving a merge conflict with git-svn
Date: Sat, 14 Nov 2009 01:30:57 +0100 [thread overview]
Message-ID: <76ee5f990911131630k41a91f70n5e717befb7693463@mail.gmail.com> (raw)
Hi,
I recently came across a big conflict. Someone used Subversion and
made a complete wrong commit. I did a 'git svn rebase' at some point
and ran into the conflict. My goal at this point was to remove the
wrong commit, but I found no way how to do it (git-revert needs a
clean tree; git stash brought [fatal: git-write-tree: error building
trees,Cannot save the current state]). What way would suggest to
remove that wrong made commit and continue with the rebase?
Thanks for any hints.
next reply other threads:[~2009-11-14 0:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-14 0:30 Jens Kubieziel [this message]
2009-11-14 0:58 ` Resolving a merge conflict with git-svn Daniele Segato
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=76ee5f990911131630k41a91f70n5e717befb7693463@mail.gmail.com \
--to=kubieziel@googlemail.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).