what would be the case where one would need git merge, with or without ff flag, sorry am quite new to git, and rebase seems like the best option
my use case is that in an app that I am working on, an other dev sent a PR to the main branch and I did a commit before pulling.