Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Get started Tell me more
Atlassian Community about banner
4,556,003
Community Members
 
Community Events
184
Community Groups

A file is deleted from branch1 and present in branch2. Unable to switch branch from branch2.

DipakP
DipakP Mar 14, 2021

A file is deleted from branch1 and present in branch2. Unable to switch branch from branch2.

The file is still present in branch2, now when I try to switch from branch2 to branch1, sourcetree is giving me error -

'Your local changes to the following files would be overwritten by checkout'

Why is sourcetree not able to treat the file as deleted.

Any steps to resolve this or any steps I am doing incorrectly?

Answer
Watch
Like Be the first to like this
161 views

1 answer

0 votes
Hana Kučerová
Hana Kučerová
Community Leader
Community Leader
Community Leaders are connectors, ambassadors, and mentors. On the online community, they serve as thought leaders, product experts, and moderators.
Become a leader
Mar 15, 2021

Hi @DipakP ,

welcome to the Atlassian Community!

How exactly did you delete the file from branch1? Did you commit this change back to branch1?

I think you get this error message because there are some non-commited changes now.

View More Comments
DipakP
DipakP Mar 15, 2021

I have committed the changes to branch1. 

There are no non-committed changes in branch2.

Like
Hana Kučerová
Hana Kučerová
Community Leader
Community Leader
Community Leaders are connectors, ambassadors, and mentors. On the online community, they serve as thought leaders, product experts, and moderators.
Become a leader
Mar 15, 2021

@DipakP , please, when you go the File status, what you are able to see in Staged files and Unstaged files sections?

st.png

Like
Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

See all events