schacon

24 ms·

211.
by schacon 16y ago
here is me giving more or less this same talk: http://chacon.blip.tv/file/4213359/
212.
by schacon 16y ago
to be fair, it's meant to help give presentations. it's very specifically designed to not advance on mouse click because that allows you to use your mouse to highlight things on a slide, which I do all the time. You can use arrow keys or
213.
by schacon 16y ago
It's unfortunate that this article concentrates on why they think traditional management is ending and almost nothing on what they think would be replacing it. I just did a talk on something very similar to this at FOSSLC in Ottawa (about
214.
by schacon 16y ago
I did actually run for Congress a few years ago ( http://www.politicsandtechnology.com/2005/10/scott_chacon_fo... ), so I can tell you as a developer and having been a political candidate, that being a developer is much, much easier. I'm a
215.
by schacon 16y ago
I would highly recommend using an MIT license - I think everyone working at GitHub uses it for all of our OS work. http://github.com/schacon/showoff/blob/master/LICENSE It is very open and people that are interested in learning from or us
216.
by schacon 16y ago
we do basically just build up the response in memory (using a Rack::Response object), but the largest response is generally the size of the latest checkout, which is rarely very big, and only has to be there for a few seconds. if it becomes
217.
by schacon 16y ago
in most cases, merge will always do where people use rebase. rebase is only _really_ necessary when you're trying to keep a patch series up to date with a moving upstream head. i wanted to keep the basic reference simple, just the command
218.
by schacon 16y ago
I would argue that your SCM tool should be less like a compiler that just needs to get out of your way and just do it's job how you expect it and more like a text editor. Do you use emacs or vim, which have learning curves but are powerful
219.
by schacon 16y ago
Yes. The use case is for organizations who have a lot of developers, some of whom want to (or demand to) continue using Subversion for their VCS needs. This can include people who don't really want to use VCS at all, but have become comfor
220.
by schacon 17y ago
"fork" is what we use to describe a user-branch of a project, where another user has write access to their own fork of the project. other dvcs hosts use the term 'fork' to describe this as well, such as BitBucket and MicroSofts CodePlex.
221.
by schacon 17y ago
i would also recommend the pro git book - it was a more unified effort and is being maintained actively.
222.
by schacon 17y ago
The storage model does not - it is not file-delta based, like SVN and Mercurial. However, you as a developer can (and often do) think of the commits in terms of a changeset or "work introduced" - this is evident in tools that exist like 'r
223.
by schacon 17y ago
Binaries are not merged - if histories diverge and one side changes but the other does not, it will choose the side that changes. If both sides change, it will record a conflict and you have to choose one side (or create a new binary that
224.
by schacon 17y ago
To be pedantically accurate, it's merges with more than two parents.
225.
by schacon 17y ago
Really? I do the opposite. You can't commit at all without hitting the server in SVN, where I can go for quite a while in Git without pushing. I would assume that most people would push in Git much less often then committing in SVN. It'
226.
Graft Git History Together with git-replace(progit.org)
2 points by schacon 17y ago|0 comments
227.
by schacon 17y ago
no, i think that maps to 'git format-patch' and 'git am' for creating and applying patches as email. there is actually an 'hg bundle' command that does largely the same thing as 'git bundle'
228.
by schacon 17y ago
I _believe_ this idea was taken from Hg, actually. Though it's not new - 'bundle' has been in Git for almost 3 years now, since 1.5.1
229.
Git over Sneakernet(progit.org)
4 points by schacon 17y ago|0 comments
230.
Automatic merge conflict resolution with Git(progit.org)
2 points by schacon 17y ago|0 comments
231.
by schacon 17y ago
that is a pretty seriously flawed report, and was even when it was released almost two years ago. even at the time, nearly everything in both the "Git Advantages" and "Mercurial Advantages" sections are either plain wrong or misunderstood.
232.
by schacon 17y ago
That's interesting - I believe it is used to continue partial downloads in dumb http mode. Technically, you can figure out the bytes needed out of the packfile from the index that is downloaded, so I suppose it is possible. However, it wo
233.
by schacon 17y ago
you have to remember that this is not serving web pages - this is fetching and pushing data, which generally takes several seconds or even minutes. Having a clone take 45 seconds isn't really a big deal, but nobody would wait for a webpage
234.
Git's New Smart HTTP functionality(progit.org)
96 points by schacon 17y ago|17 comments
235.
Undoing Git Merges(progit.org)
2 points by schacon 17y ago|0 comments
236.
by schacon 17y ago
i just want to say that the wifi there was really good. i go to a fair number of conferences and it's always very impressive when the wifi is that good for that many people.
237.
by schacon 17y ago
I don't remember that being Kevin Costner's line. Shouldn't it be "James Earl Jones is full of Sh t"?
238.
by schacon 17y ago
you know, the meld/p4merge style side by side diff views have always been rather confusing to me. i've been trying to learn to use vimdiff for merge conflicts lately and it's just not as intuitive to me as inline conflict markers. i'm real
239.
by schacon 17y ago
I tried that about 8 ways from Sunday - all I was getting was a black screen of ambivalence and a dead USB port until I COPS'd it. I finally just gave up for the time being.
240.
by schacon 17y ago
Yeah, it had a pretty small mention in the 1.6.6 release notes, but you can learn about it here: http://www.kernel.org/pub/software/scm/git/docs/git-http-bac... It works great - we'll get it supported server-side on github soon.

More ›