I have two branches: main and test. There are more commits in test, so main is behind the test branch.

I created a new branch from main, I committed and I tried to merge a new branch into test.

I have a lot of conflicts. How can I avoid it? I do not want to solve it manually.