Merging directories after JPEXS snafu overwrite .git/