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.
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:
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.