It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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

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
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Posted Jan 17, 2019 in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

1,343 views 13 14
Join discussion

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