How to ignore uncommited change in Github gui for MAC?

Question

I am using Github GUI for Mac. Now I've some changes in my local repository, but I want to ignore them and pull latest remote repository. I tried Repository/Pull, but got Git Error.

"•error: Your local changes to the following files would be overwritten by merge: Classes/xxx.m Please, commit your changes or stash them before you can merge."

I tried Repository/Synchronize, but got following error.

"Sync Failed. Please commit all your changes before syncing."

Any idea?

score 5 · Answer 1 · answered Oct 31 '14 at 17:28

5

Place a checkmark near each of the changed files, then go to the Repository menu and click Discard Changes to Selected Files.

answered Oct 31 '14 at 17:28

user01380121

527
6
18

I wish they had added this to the context menu. – Rahul Desai Feb 09 '16 at 20:17

score 3 · Accepted Answer · answered Jan 02 '14 at 11:45

3

If you mean using MAC GUI only, check and right click the changed files then select the discard the changes.

answered Jan 02 '14 at 11:45

Leo wang

46
3

score 1 · Answer 3 · answered Jul 08 '12 at 17:46

1

if you want to remove your uncommitted changes, just do a checkout on those files again.

Stash is super easy too though, and it keeps your changes in a local 'bucket' or stash :)

answered Jul 08 '12 at 17:46

Evert

93,428
18
118
189

Thanks for your quick answer. I unchecked all my changes, and try to repository/pull, but got same result. – ttotto Jul 08 '12 at 18:02
It's not a pull, it's a checkout – Evert Jul 08 '12 at 18:51
I mean Repository menu / Pull command in the Github Gui on Mac. – ttotto Jul 09 '12 at 00:45
1

@Evert how do you `stash` on the GitHub for Mac GUI? Or is the only way to do it via the Terminal? – chharvey Mar 12 '14 at 03:13
The lack of native stash functionality in the GitHub GUI is the only thing stopping me from using it as my primary Git GUI client. For now, I'm sticking with SmartGit. – Colin Basnett Dec 30 '15 at 23:23

score 0 · Answer 4 · answered Mar 17 '15 at 09:08

0

For those on Github for Windows, it is not obvious where Discard All Changes is, so I wanted to share this:

Select Files by using check mark next to names.
Right click on Collapse All/ Expand All button with two arrows. (This button is on right side of Files to Commit box, and under Sync and Gear icons.) This is where Discard All Changes is >hidden<.

Sorry but too low level to add comment to @Leo wangs or @aspiringwebdev chain above. You gotta start somewhere...

answered Mar 17 '15 at 09:08

micstr

5,080
8
48
76

Github for Windows instructions can be found at https://stackoverflow.com/questions/24975043/rollback-uncommited-changes-in-github-for-windows – Mark Cramer May 03 '17 at 02:57

How to ignore uncommited change in Github gui for MAC?

4 Answers4