pull request conflictions

i did a pull request and i got lot of files so what to do in that case i'm not getting which option should i use as it's in my unstage area how would i use an option to clean my sourcetree??

image2015-7-14 11:48:39.png

2 answers

I must say i don't understand the beginning of your question, but the answer to the end is that in order to clean your working folder, you need to press the big Discard button on the main screen (at the top, next to Commit and Checkout).

Or "ignore" the files you want to keep but don't want to see in Sourcetree, by name or by extension.  You can do this via the contextual menu (right click in Windows?  double click for Mac).  Or, directly edit the file .gitignore.  Here's what mine looks like. The * is a wildcard

 

*.rtf

*.dta

*.gph

*.ft

*.bbprojectd

*.sthlp

*.log

*.do

*.pdf

type1.ado

*.plist

.gitignore

 

 

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

2,025 views 1 5
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