I created a new branch called new based on develop (clone). At the beginning I messed up by accidentally committing 100MB+ file. A few days later, I tried to push to remote and it failed because of this big file. I haven't found another way to remove this file than to remove all history (now the branch new has only one commit). How can I merge this branch with develop so new contains all history from develop ?
I've cloned the repo with:
git clone http://...
And then
git checkout -b new develop
Current new state:
rm -rf .git
git init
...
I could make another branch from develop, overwrite it with new files, commit and merge back to develop, but that would make all my deleted files stay.