Hello to all,
i've a problem that prevents me to merge.
I'm on master branch and i have 63 incoming commits to merge.
Unfortunately, in the middle of merge operation i get this exception:
An internal error occurred during: "Merging with refs/remotes/origin/master".
Exception caught during execution of merge command. java.io.IOException: Could not write file D:\Sviluppo\Git\jem_the_bee\JEM\lib\ant\._ant-javamail.jar9051474608435913818.tmp
I also tried with an hard reset, that does not solve the problem.