hold off committing for a bit?

[Jonathan "Duke" Leto]

Howdy,

>
> Duke:  This was (bad) side effect of the problem last night where you and I were each fixing the same point in the same file.  I got a merge-conflict there last night.  I thought I had it all cleaned up at that time.  Turns out I had not.  So things got further muddled today; one thing led to another ...
>
> To clear things up on my end, I blew away my local repository and did a fresh clone from git.
>
> Sorry for the inconvenience.

No worries, Jim. If there is anything that I can add to our git
workflow document to prevent others from running into something like
this, please let me know.

Duke


>
> Thank you very much.
>
> kid51
>



-- 
Jonathan "Duke" Leto <jonathan at leto.net>
Leto Labs LLC
209.691.DUKE // http://labs.leto.net
NOTE: Personal email is only checked twice a day at 10am/2pm PST,
please call/text for time-sensitive matters.