Re: git:

[Glenn Morris]

Glenn Morris wrote:

> It's a shame git is less user-friendly (refusing to pull if you have
> uncommitted changs, even if the changes are identical to what you want
> to pull) than eg bzr or svn, which just do the sensible thing (pull and
> resolve conflicts automatically where possible).

PS just to throw yet another thing out there, the generally advertised
solution for this problem seems to be: git stash; git pull; git stash
pop. Obviously this makes us look cool by playing with "stashes" and is
far superior to things Just Working like they used to. Yours grumpily...