Git still can’t properly merge moved folders

You’d think after all these years Git would be able to do such a basic thing, right? In my branch I reorganize the project structure, in his branch the teammate does further development, and two days later we merge our work and go for a beer?

Continue reading