staging and remove the research folder. git rm -r researchdevelop into staging. git merge --ff-only developmain and remove the research folder. git rm -r researchstaging into main. git merge --ff-only stagingFor better understanding of --ff-only option, check out the git documentation.