In running a "git upci" on a particular file, it has been updated in
the svn repository but not yet picked up by the git svn "fetch"
repository or put into the git repository.
Running git upci (update-ref and dcommit) I get an error message from
dcommit.
Commiting to svn repo/README.txt
Merge conflict during commit: File or directory 'README.txt is out of
date; try updating: The version resource does not correspond to the
resource within the transaction ...
I had updated the file with a git pull and the automerge was
successful. I have identified the lines that were changed within svn
and also the lines committed from within git. What do I do now?
Should I issue a git push from my local git to the git repository
followed bu a git svn dcommit and then a git svn rebase and git push
from the fetch repository?
--
Sabba - סבא הלל - Hillel
Hillel (Sabba) Markowitz | Said the fox to the fish, "Join me ashore"
sabbahil...@gmail.com | The fish are the Jews, Torah is our water
http://sabbahillel.blogspot.com
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/git-users?hl=en.
