I created a branch based on the test branch. I made a number of edits and now I want to merge it into the development branch. But the development branch has a number of commits that are not in the test branch, which is why conflicts appeared. What sequence of operations in git should I do with my branch to remove the conflicts, but so that when merging my branch into testing there are only my commits.

Rebasing to the development branch and resolving conflicts removed the conflicts, but now when merging into the test branch there are extra commits from the development branch.