Trying to revert some changes via "Discard hunk". The change was: a blank line that contained some trailing spaces into just a blank line (with no spaces). This change came about from adding some debugging code and subsequently removing it (leaving a different blank line that was there before).

It appears that git-apply is refusing to apply the patch (to revert the change) because it would only add whitespace.

There's an option to git-apply to ignore this

--ignore-whitespace

or to deal with it

--whitespace=<action>

but SourceTree doesn't use those, or even expose them to me as a user to tell SourceTree that I want that option used.

The only work-around seems to be to go into the IDE and changes the lines myself, which defeats the purpose of using SourceTree in the first place...