How to perform merge?

Question

I have a master branch and a feature branch. The feature branch has several changes but the master branch has many changes like removing 10 projects from the repository. The

Answer 1

Both result in same state for master. Its just that feature branch is brought to same state as master in first case and remains unaffected in second case.

If you are asking which one to do, then doing the first is preferred way. You should merge master "into" feature first, so that any bugs after merging do not affect the master. Keeps the master clean. This also ensures that there are no merge conflicts in the master ever.

This is my general practice: Merge master into any feature branch and check that everything works fine. If something is broken, fix it. Then merge the latest master again. Only after the merged branch seems good, that this is put into master.