2

I replaced a folder and all its contents with a symlink. That is removed the folder and added a symlink, in a single git commit.

Git commit happened normally. However when I try to push to the upstream svn, it complains that the file exists.

Now, how do I amend my commit to not contain the git add of the new symlink and make it a new commit, so SVN can understand to remove and replace the folder; or can I use the svn commit force via git amend.

This is the error I get: 

RA layer file already exists: File '/svn/uswaretech_zobpress/site_media/frontend' already exists at /usr/lib/git-core/git-svn line 508
lprsd
  • 84,407
  • 47
  • 135
  • 168

1 Answers1

2

To remove the file from the HEAD commit:

git rebase -i HEAD~
git rm /path/to/symlink
git rebase --continue
Alan Haggai Alavi
  • 72,802
  • 19
  • 102
  • 127