Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
Next:
badges earned

Your Points Tracker
Challenges
Leaderboard
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Recognition
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Kudos
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

fetch and merge operation in source tree

Instead of doing pull operation from source tree, I want to do fetch and merge operation to check which are all the files pulled from my remote repository to local.

In merge operation, I can see all the files that are fetched from remote. Out of them, I don't want my local file to update with remote changes in 1 of the file. Because in 1 of the file, I am currently doing some inprogress work. so, I don't want to push these in progress changes at this stage and at the same time, I don't want to take update from repository for this file. can I ignore that particular file in doing the merge operation?

1 answer

0 votes
minnsey Atlassian Team Apr 17, 2018

Hi

I would suggest stashing the 1 file you have changed before running the fetch + merge.

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

3,334 views 4 5
Read article

Community Events

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

Find an event

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

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you