Pull request conflicts

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.

1 answer

This widget could not be displayed.

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

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

724 views 1 3
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you