Bring the current state of the branch to the current state in the master branch?

Question

git

Dear friends, this is my dilemma, which appeared due to laziness, of course =)
The essence of the problem is the new branch, but it needs to make changes that were made in master and they are very important and their 20 commits (albeit with not more which changes in each). But the problem is that there are a lot of differences between the master and new, and with rebase there are a lot of conflicts that are associated with renaming objects, replacing one component with another, and so on.
So if there is a way to use Git to tear out changes between revisions of master and make them into new?
git format-patch+ git ampour a bunch of errors and are not applied.
Maybe apply some kind of rebase approach, not just straight git rebase masterfrom the new branch, but some kind of stage-by-stage?
I'm looking for advice and suggestions...

Answer 1

git pull <project path> master?
Or just git merge master

Answer 2

git rebase -i

Answer 3

As a last resort, you can merge a specific commit:git merge h4shc0d3