How to change master branch in Pull Request?

Question

git

Imagine this example
There are 3 branches, master , one , two .
I created a new branch from one . ( git checkout -b test )
Then push and create a PR on branch one .
Then I decided that I want to change the branch and give a PR to the two branch .
The problem is that when I change the branch in githube to two, then there are many changes from other developers, and instead of my commit, there are others, besides there are conflicts ....
How to painlessly change the master branch? Tell me the detailed steps. Thank you.

Answer 1

As I understand it, you didn’t merge anything into the master, so you don’t need to change anything in the main one. You just need to pull the changes from the main branch into your branch, merge and resolve conflicts. In order to reduce such conflicts while you are working in your branch, you need to merge changes from the master more often. And in general, before uploading it to the master, you need to pull the changes from the master itself, if there are conflicts, resolve them and only then merge them into the master.
And no one will tell you the detailed steps, you have to see what is really happening there.