bennoleslie

5 ms·

1.
by bennoleslie 15y ago
Sorry, that did come across as a bit defensive. However, I think if you read the whole article carefully it explains that after doing a git pull, and git refusing to merge because of outstanding changes you then have a chance to either 'rev
2.
by bennoleslie 15y ago
I'm not sure where you get the idea that I'm not committing early? If it was the comment saying '3 days of straight hacking' then I apologise for my prose being unclear. I was only bringing that up because my first assumption was that after
3.
by bennoleslie 15y ago
Yeah, HFS+ is a nasty beast. In this case not the culprit, firstly because the first thing I do when getting a new MacBook is reformatting as case-sensitive, and secondly, because it was just a directory rename (e.g: ./foo/ to ./bar/). Yeha
4.
by bennoleslie 15y ago
In this case the git pull man page is relatively clear that: "If any of the remote changes overlap with local uncommitted changes, the merge will be automatically cancelled and the work tree untouched"
5.
by bennoleslie 15y ago
Exactly, in fact it normally does. git pull is actually really useful for enforcing this most of the time. If you inadvertently do a 'git pull' before doing a commit, and you have any overlapping changes, then git aborts the merge. This is
6.
by bennoleslie 15y ago
They were obviously saved. I was simply pulling before committing, which is a supported work flow of the tool. I don't think I ever said I went days without committing.
7.
by bennoleslie 15y ago
Sure, I would agree with that, but in this case I already knew what the one commit I was pulling did. And the fetch,diff, merge wouldn't have helped. The file that was destroyed wasn't changed in the commit that was fetched.
8.
by bennoleslie 15y ago
Just to point out that fetch + merge would have caused the same problem. In this case it was a small team, with advance knowledge of what the commit was, so no need to inspect. But, in any case doing the fetch would have shown that the file
9.
by bennoleslie 15y ago
No, you don't interpret correctly. It was not 3 days of uncommitted changes, it was committing some changes after hacking for three days. Completely different thing. The 3 days was relevant because I was tired and my first assumption is tha
10.
by bennoleslie 15y ago
http://agilezen.com/ is very close, and actually has a bunch of other useful features too. Although I've got to say that trello is a lot slicker than agilezen.
11.
by bennoleslie 15y ago
The rental market in the inner suburbs of Sydney is pretty expensive. It certainly helps to have employment and real estate agents will often ask for some kind of employment reference. I don't know of any impediments for non-citizens in ter
12.
by bennoleslie 15y ago
The way in which the failed product was handled is impressive, but I'm left wondering if there are any more details on the approach that failed? Sharing why a given approach doesn't work could save others with the same technical idea from w