Answer
-
Merge "feature-b" into main. While you were working on your branch, other devs may have merged their work into the main branch, so before merging your code, you should try to get the latest version.
a. What commands would you use and why?
I would use the command to have locally all the recently changes from others dev and prevent possible conflict.b. What merge method would you use and why? I would use command to merge the changes. This is the usually way to do it, and It use the Fast-forward method.