After creating branch feature1 from branch master, there were commit(s) in each of these branches. If you merge the master into the branch feature1 you are currently working on, there will be a conflict. In such a situation, please explain the characteristics, pros and cons, and points to note of the 3-way merge method and the rebase method.