From: Kendall Shaw <kshaw@kendallshaw•com>
To: git@vger•kernel.org
Subject: git svn dcommit error 1
Date: Fri, 23 May 2014 09:09:42 -0700 [thread overview]
Message-ID: <537F72C6.3060001@kendallshaw.com> (raw)
I have made a couple of commits. Then:
git svn rebase
For each of my modified files it says they need to be updated. This is
probably wrong, but I decided it meant that I should commit. So:
git add ...
git commit ...
git svn dcommit
The dcommit reports error 1. I see that subversion was not updated.
I read an article about using git reset and then continuing from before
the error. But, I made a couple of commits. So, what does this mean? Do
I save off copies of the different commits and reapply them manually
after resetting?
What should I do at this point?
Kendall
reply other threads:[~2014-05-23 16:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=537F72C6.3060001@kendallshaw.com \
--to=kshaw@kendallshaw$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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