Pull request conflicts

Question

Hi all i have been using bitbucket and sourcetree and i have been struggling with one thing: Illustration Mybranch name is: abc One of the "Master" branch were i take pull for changes. I took a pull and i've got lot of files in my unstage area and it includes files like php, js, css, images. i have got more than 400+ files which contains changes. please elucidate which action should i do here.

Balázs Szakmáry · Answer

Not exactly sure what you did so far, but this is the simplest way to resolve a merge conflict in a pull request in SourceTree:

* (Make sure you have no pending changes and are in your feature branch ('abc' above))
* Fetch
* Merge origin/master into your feature branch (you can do this by right-clicking on the branch in the branch list in the remotes section, under your local branch list)
* Resolve conflicts
* Commit* Do not change the contents of the stage in the commit dialog or otherwise.

* Push