Pull request to develop showing changes that is not mine

Question

Hi everyone!

I'm trying to create a pull request here, but some strange is happening...

First, I create a hotfix branch from master, I committed  my changes, and then opened two pull requests, one for master and one for develop.

For master, everything is ok and only my changes appears:

However, for develop, others changes appear that are already in develop and they interfere on the pull request analysis:

How can I avoid this problem? :(

Mark C · Answer

Hi @tasken_emauricio,

It is possible that a different merge strategy was used for master and develop, hence, you're getting a different result.
For example, the "squash" merge strategy was used for master and "merge commit" was used for develop.

For that, you can try using one merge strategy for both branches to get the same result (e.g. merge commit strategy).

Regards,
Mark C

tasken_emauricio · Answer

Hi @Mark C

We use this merge strategy:

But, sometimes when de PR contains a conflict is necessary resolve the conflict and merge by Source Tree. I don't now what merge strategy Source Tree uses.

Thank you !

Mark C · Answer

Hi @tasken_emauricio,

Thank you for reaching out to the community.
Would it be possible for you to confirm what merge strategy the team is using to merge pull requests?

Regards,
Mark C