{var%20f='http://v.t.sina.com.cn/share/share.php?appkey=1515056452',u=z||d.location,p=['&url=',e(u),'&title=',e(t||d.title),'&source=',e(r),'&sourceUrl=',e(l),'&content=',c||'gb2312','&pic=',e(p||'')].join('');function%20a(){if(!window.open([f,p].join(''),'mb',['toolbar=0,status=0,resizable=1,width=440,height=430,left=',(s.width-440)/2,',top=',(s.height-430)/2].join('')))u.href=[f,p].join('');};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();})(screen,document,encodeURIComponent,'','','https://www.manongdao.com/data/attach/logo/logo.png', '推荐 Lonely孤独者° 的问题《Don't let git rename files during merge》','https://www.manongdao.com/q-911905.html','页面编码gb2312|utf-8默认gb2312'));){kind=link}
I'm trying to merge branch 'a' into branch 'b'. I have files that are the same in each branch, where the only difference is the filenames. When I merge 'a' into 'b', the filenames for 'a' overwrite 'b', is there a way to stop this?
These files are also in a directory, it would be good if I could prevent any file being renamed in that directory.
Or alternatively, is there a way to restore the old filenames after the merge?
Seems like:
git merge -X --no-renames a
Did the trick, thanks to the people on #git on irc.freenode.net