What is git thinking?

I don't understand what git is thinking sometimes. In SourceTree, I pulled the latest code from the repository with rebase selected, it told me it couldn't apply a patch, and to resolve the issue manual and then continue the rebase from a git shell.

So I proceeded to do that. One thing I noticed was that git deleted one of my files!!! <-- What on Earth is git thinking? Why would it ever think of deleting a file in response to rebase issues? No one on the team deleted it. There was absolute nothing wrong with the file, and when I undid the deletion, and finished the rebase, the file worked just fine.

1 answer

0 votes

Hi

Its difficult to comment without understanding more of the context, is it possible the file was deleted by one commit but restored by another and hence if appeared to have dissappeared because the rebase paused part way through?

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted Oct 08, 2018 in Teamwork

If you could delete any meeting from your calendar, which one would it be?

Let’s face it: most of us have too many meetings on our calendars. And few things are a bigger waste of time than recurring meetings that no longer provide any value to attendees (or the busines...

520 views 16 9
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