Conflict 1 from develop Conflict 1 from feature/merge-conflict

Conflict 2 from develop Conflict 2 from feature/merge-conflict

Conflict 3 from develop Conflict 3 from feature/merge-conflict

Hey I'm the developer Nº1 Hey im the second developer Yepa, im the 3º developer

Created new branch "develop" from masterl

git checkout -b develop

Created new branch "feature/create-feature-branch" from develop.

git checkout -b feature/create-feature-branch

Created new commit and push to feature branch.

git status
git add README.md
git commit -m "My commit feature"
git push

Maybe should do this:

git push --set-upstream origin feature/create-feature-branch
git push

Pull Request.

git checkout develop
git merge feature/create-feature-branch