git merge or rebase - vastly different master
<p>I had been working on a feature branch for some time now and when I try to merge to master, I notice the master has changes significantly, with some files in my branch have been moved to different folders on master and I have new files in my feature branch too.</p>

<p>I understand that I have two options, either to merge or rebase, but appreciate any input as to what would be the easiest option.</p>

<p>The branch I am working on is exclusive to me, so no problem re-writing history but master is obviously used by others and I am worried polluting it with history of changes from my feature branch</p>

<p>appreciate the step by step guide of this process as I am new to GIT and do not want to mess up things for others.</p>

<p>thanks</p>