I don't merge every 5 minutes, I commit every 5 minutes.
One of the advantages of extremely granular commits is that I'm also
pulling in other peoples' changes practically in realtime - and more
importantly, I use git's feature branching. So I only have to do a
merge every, hmm, half month to a mo
On 7 Feb 2009, at 7:00 pm, elliott cable wrote:
While the merging may be not perfect, it works 99% of the time - and
that's more than enough.
It works especially well if you commit as granularly as I do (one
commit between every one and three minutes, no longer than 5 minutes -
every single ch
Git works fine on binary files - I just don't want to mark them as
binary, because I enjoy retaining my diffs and merging, however
tenuous that power may be.
While the merging may be not perfect, it works 99% of the time - and
that's more than enough.
It works especially well if you commit as gra
On Fri, Feb 6, 2009 at 11:21 AM, elliott cable wrote:
> It's actually a complex process. It requires that you manually manage
> your XIB changes to some extent, in a painful way (I'm in the middle
> of writing a tool to do all of that for me), and even then, there are
> circumstances where such a
On Feb 6, 2009, at 8:21 AM, elliott cable wrote:
On Thu, Feb 5, 2009 at 11:02 PM, Kyle Sluder
wrote:
On Fri, Feb 6, 2009 at 1:05 AM, elliott cable
wrote:
today, and I'm running into the same problem. Does anybody know
how I
can fix it *without* switching away from XIBs? (I'm versioning
On Thu, Feb 5, 2009 at 11:02 PM, Kyle Sluder wrote:
> On Fri, Feb 6, 2009 at 1:05 AM, elliott cable wrote:
>> today, and I'm running into the same problem. Does anybody know how I
>> can fix it *without* switching away from XIBs? (I'm versioning my
>> stuff in git, I have to use XIBs to get mergi
On Fri, Feb 6, 2009 at 1:05 AM, elliott cable wrote:
> today, and I'm running into the same problem. Does anybody know how I
> can fix it *without* switching away from XIBs? (I'm versioning my
> stuff in git, I have to use XIBs to get merging functionality).
How is Git able to merge changes to XI
On Feb 5, 2009, at 10:05 PM, elliott cable wrote:
On Tue Nov 11 05:09:44 2008, Joey Hagedorn wrote:
On Nov 10, 2008, at 3:01 PM, Christopher Kempke wrote:
I'm trying to create a very, very simple QuickTime viewer in Cocoa.
I create a new Application, add QTKit and Quicktime frameworks, and
d
> On Tue Nov 11 05:09:44 2008, Joey Hagedorn wrote:
>
> On Nov 10, 2008, at 3:01 PM, Christopher Kempke wrote:
> > I'm trying to create a very, very simple QuickTime viewer in Cocoa.
> >
> > I create a new Application, add QTKit and Quicktime frameworks, and
> > drag a QuickTime Movie View into the
On Nov 10, 2008, at 3:01 PM, Christopher Kempke wrote:
I'm trying to create a very, very simple QuickTime viewer in Cocoa.
I create a new Application, add QTKit and Quicktime frameworks, and
drag a QuickTime Movie View into the main window.All is well if
I run now (although the movie vie
I'm trying to create a very, very simple QuickTime viewer in Cocoa.
I create a new Application, add QTKit and Quicktime frameworks, and
drag a QuickTime Movie View into the main window.All is well if I
run now (although the movie view is blank).
Going back into Interface Builder, I sele
11 matches
Mail list logo
