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