Will there be a conflict in the Pull Request?

Question

git

Hello everyone,

let's say me and another person are working on the same file (settings.py) - each created a branch from develop at the same time, I edited the file (added new text) and do a Pull Request to develop , which is then approved/merged, and then it makes a Pull Request , but this file in the develop branch has already been added after my merged PullRequest... how to avoid such conflicts - do git fetch or...

all the best,
Vadim

Answer 1

Pull develop into your branch regularly:
git pull origin develop
You can't avoid what can't be avoided, but merge conflicts will be less painful as long as the memory of the changes made is fresh.

Answer 2

So after all, your team is pulling the latest changes to the develop branch,
and we still need to do it on our local

git checkout develop
git merge branchfromdevelop

strange, but no one described it !!!
I just don’t quite understand what the state will be after this merge !
if everything is fine, then do git push origin branchfromdevelop and then create your own pull request (for example, on Github), and if not, then fix it before Pull Request