git - Should you git branch if the intention is to change the master branch drastically

Question

I am taking over the ownership of a git repository which only has a master branch. I intend in branching a develop branch and drastically changing the repo structure.

If I do this and then merge back into the master. Should I be using the 'ours' merge strategy to just forcibly use my branch in merge conflicts instead of master.

Or would there be another preferred approach? Quite often in the past if I try to merge a drastically changed branch with the master branch in order to push to live, conflicts inevitable arise.

Answer 1

仅当同时更改基本分支时才会出现冲突。

取决于您期望不应该使用的更改ours，因为它可能会丢弃有价值的更改。如果你不在乎：去吧。

最好的方法是确保master在此期间没有或只有少数易于合并的提交发生。