New changes from develop appears while resolving conflicts via feature branch

[cheremisin_k]

Hi there!

I'm using https://bitbucket.org/ and Git. I work on my feature branch from 'develop' branch.

develop -> feature

I open a pull request into develop branch and I see a conflict appears.

Direct pushing into the develop branch is not allowed so I resolve conflicts via feature branch.

Scenario:

git checkout develop

git pull

git checkout feature

git pull origin develop

-- resolve conflicts manually,

git add, commit, push

I expect that I will see a conflict file.

In real I see the conflict file + a few files changed in 'develop', but not changed in my feature branch. And it could be confusing in some cases. 

Is it possible to resolve conflicts via 'feature' branch without having changed in 'develop' files but not needed in the 'feature'?

[cheremisin_k · Accepted solution]

Found the answer here:

The other alternative is to pull master branch, create a conflict_resolution branch off of master, merge the feature branch into conflict_resolution, push, and then do a Pull Request from conflict_resolution into master.