How to pull on sourceTree (from git) while ignoring errors?

[Jayn a]

I've pushed my changes to git using sourcetree, my friend made some changes. In the meantime, I've changed some irrelevent files also - which I don't care to lose. However. when pulling from sourcetree I receive errors (because our files our different). How can I pull from sourcetree while ignoring the erros? (again, I don't care about my directory. just want to get my friend's changes that are the most up to date - we're working on the same files).

SourceTree_2016-03-22_11-29-58.png

[Johannes Kilian]

This is rather a git than a sourcetree question.

You want to do a forced sync: Overwriting your local changes with the current state of the remote repository.

What I do in this situation - via git commandline:

git reset --hard
git fetch --all
git reset --hard origin/master

This discards all my local chances and fetches the latest chances from origin/master

[Jayn a]

Where do I write these commands ?

[Johannes Kilian]

Within sourcetree you can open the git commandshell:

SourceTree_2016-03-22_11-29-58.png

[Seth]

If you haven't committed the irrelevant changes, you can use the Discard button.

If there are files that are irrelevant, you might consider removing them from the repo ("stop tracking"), and then adding those files to your git ignore list.

[Seth]

I think you're right Tim. I read "irrelevant files...which I don't care to lose" as "irrelevant files which I don't care if I lose". Not sure what's trying to be achieved here.

[Tim Crall]

I'm not convinced that I understand the question correctly, and I'm not convinced that the answers below do, either.  You said you have irrelevant changes that don't want to lose, but your friend has changes?  Are these source files?  If they are, then I don't understand what you mean by saying that they are irrelevant and yet you don't want to lose them. You either need to accept your friends changes or not.  Git is not well suited for accepting changes on some files but not others, except in the case of resolving conflicts.  If they're not source files but are files that just happen to be in the same directory, then, as Seth notes, they should be removed from tracking and ignored.