Correct permission of conficts during PR merge?

Question

git

Hello, I just can't figure out what seems to be a simple thing.

I have a branch develop, it contains some feature that I want to merge into the branch master. These 2 branches differ from each other by 1 commit (in the develop branch of the path for the test environment, in master for the sale).
I create a PR and follow the instructions . After I fix the conflicts, the paths in the develop branch change from test to production, those commits from master "leak" into develop.

How can I fix PR conflicts so that unnecessary commits do not get into develop?

Answer 1

How can I fix PR conflicts so that unnecessary commits do not get into develop?

Don't commit too much in develop. Delete the extra commit.
Prod and test should not differ in code. If you still really want to put something like this under version control, then keep both configs there, and switch between them on a specific server.