I tried to commit my git repo on a subversion system and something went
wrong. Here in detail what I've done so far:
1. starting from a commit on our svn, I launched this command:
`$git svn clone my_repo_url -s `
2. worked on my code (so I've made my stuff);
3. when all was ok I rebased everything. Since I read that svn doesn't
work very well with branches;
4. So, with a single branch (master), I ran this command: `git svn dcommit`
5. The push onto svn server failed (probably some conflicts to resolve). I
didn't want to solve those at that moment so I launched this command: `git
rebase --abort` (maybe I didn't read very well what it does, but git was
suggesting this);
6. Right now I have lost my solution (.sln file) and on a project I can
see a folder called 'Backup' (with all my classes duplicated)... wtf
The simple question is: what is happening? How can I restore my solution
before to the 'git svn dcommit'?
Here the output of my .git/logs/HEAD:
5edc59acb6e200aef991d7de124008f8120ee187
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538033064 +0200
commit: Change the Map table label
1234c77ff6a21551ea615bee11cd9c56f2beb839
0d80fd2165866dd809dbdf16287898a71d31fecb my_name my_email 1538059453 +0000
rebase: checkout refs/remotes/git-svn
0d80fd2165866dd809dbdf16287898a71d31fecb
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538059583 +0200
rebase: aborting
1234c77ff6a21551ea615bee11cd9c56f2beb839
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538059584 +0200
rebase: updating HEAD
1234c77ff6a21551ea615bee11cd9c56f2beb839
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538059671 +0200
checkout: moving from master to TestMergeSvn_feature
1234c77ff6a21551ea615bee11cd9c56f2beb839
14687b653cd9b13bba47a971af002f95bfac3bf6 my_name my_email 1538059705 +0000
rebase: checkout refs/remotes/git-svn
14687b653cd9b13bba47a971af002f95bfac3bf6
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538060096 +0200
rebase: aborting
1234c77ff6a21551ea615bee11cd9c56f2beb839
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538060097 +0200
rebase: updating HEAD
1234c77ff6a21551ea615bee11cd9c56f2beb839
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538060179 +0200
checkout: moving from TestMergeSvn_feature to master
1234c77ff6a21551ea615bee11cd9c56f2beb839
5edc59acb6e200aef991d7de124008f8120ee187 my_name my_email 1538060222 +0200
checkout: moving from master to 5edc59a
5edc59acb6e200aef991d7de124008f8120ee187
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538060314 +0200
checkout: moving from 5edc59acb6e200aef991d7de124008f8120ee187 to master
1234c77ff6a21551ea615bee11cd9c56f2beb839
e009e033a3b1811e01c08f28a0a6cc2fa71fd566 my_name my_email 1538060866 +0200
checkout: moving from master to e009e03
e009e033a3b1811e01c08f28a0a6cc2fa71fd566
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538061011 +0200
checkout: moving from e009e033a3b1811e01c08f28a0a6cc2fa71fd566 to master
1234c77ff6a21551ea615bee11cd9c56f2beb839
1234c77ff6a21551ea615bee11cd9c56f2beb839 my_name my_email 1538061307 +0200
reset: moving to 1234c77
Thanks in advance.
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
