How to merge files through directory renames?
Hello. Recently our GitHub repository's master was updated and I would like to merge the master into my branch, and later my branch into the master. However, there were some directories renamed in master. Now, in the merge, I would like to get the directory renames from master into my branch, and then go through the standard diff->merge procedure for files that I have modified in my branch. Unfortunately PyCharm claims during the merge attempt, that my files were just deleted on the side of master, so I can't merge the contents. Is there a way around it?
请先登录再写评论。
Hi,
Unfortunately it seems that git did not detect those changes properly if they are marked as deleted. Best course of action would be to rename these files yourself on your branch before attempting the merge to avoid this.