The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)

×

Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

pull request conflictions

Rohit Gayattri
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
July 13, 2015

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

Comments for this post are closed

Community moderators have prevented the ability to post new answers.

0 votes
windwagon
Contributor
July 14, 2015

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

 

 

0 votes
Balázs Szakmáry
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Champions.
July 14, 2015

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).

TAGS
AUG Leaders

Atlassian Community Events