https://wuxiaomin98.wordpress.com/2016/04/28/git-summary-how-to-use-basic-git-commands/

Git Ontology

Uncategorized

Last Friday at end of the day and I was attempting to push my changes to our team repo when I was hit with a ton of merge conflicts. I shut down my computer and went home, although thoughts of the merge haunted me over the weekend.

So when I got in today I sat with one of my coworkers, who is a git magician, and we did some trouble shooting. What I learned was that my git conception was completely wrong.

So what is git? As I understood it, it was a repository which stored ONLY FILE CHANGES tagged by a hash (a long string of numbers and letters.  This makes it useful when you work, either alone, or with a team, to change documents or code.  You have a clean audit trail of the list of changes. This, I think, is even more valuable than the ability to roll back changes.

On git there is a notion of a branch. I always thought that a branch was an organized list of commits. That branches did not know about each others commits and that branches were the fundamental unit of git.

I WAS WRONG

The commit is the fundamental unit of git – the change.  Git could be conceived as a linked list. With each commit pointing to its parent. The hash of a commit, in fact, encodes the parent of the commit.  The branch is just a pointer to a particular commit.

Since the basic unit in git is the commit, you have a lot of flexibility to re organize the commits either within a branch or between branches.  When you rebase two branches in git, two lists of linked lists, git tries to preserve the timeline (the dates) of each commit.

My hairy git nightmare started with a rebase. The parent I was trying to rebase on two was missing my commit as well as three other commits and this caused git to think I needed to merge files since it detected changes in these 3 intermediary files.  In order to fix this what I did was move the one  commit I wanted to add on the parent branch and then move the branch name pointer to this new commit so this was now the head of the linked list.   I did this via the cherry pick command.

It is good that we keep our commits small at my company, and that we keep commits on individual branches. It makes it easy to move around individual commits.  But it also gives me a lot of confidence that even if I want to rebase (or re order ) a list of commits I can do this since each commit is its own atomic unit.

Porras-Kim Whitney Biennial

Whitney Biennial – Art Etc

Uncategorized

Yesterday Lian and I went to the Whitney Biennial.  We did not discuss much of the work after, and I asked Lian why he did not want to talk about it.

He said that most of the works did not resonate with him (my words not his). That he can understand modern or contemporary art within the context of art history, but most of these works did not seem to be in dialogue with that history.

This to me was an interesting statement. It made me think about concepts like fracture, fragmentation, and order. In “The Thought of the Heart and the Soul of the World” , James Hillman talks about the greek word kosmos as meaning order, arrangement, and adornment. He connects the greek kosmos with the English word cosmetic, a word that keeps this etymological sense more than the English word cosmos.

There is something in art or beauty that is about adornment and arrangement. This is both the surface arrangement for our sense perception, but also I also think we can talk about adornment and arrangement in terms of a lineage.   How does an artwork fall into an order or arrangement of other artworks.   We talk about a great work as a ‘crowning’ achievement – a description about adornment. What is a crowning achievement for an artwork as standing in its lineage.

A lot of the work was conceptual in nature in that the idea in many respects drove the production and was perhaps more important than the production. The work was an index into the idea, rather than an idea that could only be expressed through matter, adornment, or what we would call art.  My favorite pieces were the works that seemed to create a new material language: the sculptural works of Ragen Moss and Daniel Lind-Ramos and installation of Gala Porras-Kim(who i saw last year talk at the Guggenheim and blogged about as well).  These were pieces that created worlds of their own that did not have analogs in simple conceptual descriptions.  There was a generative power to these works, a certain aliveness, that perhaps all creations have but the richness of the material representation makes it easier to construct more (and more intense) sites of communion.

A lot of the work reminded me of the Duchamp ready made, the act of an artist that disintegrated the category of art, like Wittgenstein removed the category of metaphysics from philosophy (and Kant before him did as well).

But we still have art – although this sort of cynical capitalist consumerist art is something I think about in relationship to the image of the Magician. It is a trick. The art of the Renaissance I think about in terms of the Priest or the Church – a mode of devotion.  The art of the industrial age (impressionism, cubeism, dada, everything upto the readymade) I think of in terms of the sun, as illumination, art as science, as an alternate mode of perception. What is next art after its ready made turn, once it has been valorized at the cost of content?

When I ask this question I imagine the wheel of fortune. A monte carlo simulation, an engine, or a mechanism that powers possible choices.  It is the creation of domain spaces from which we can build our reality.  Hopefully it is not a bunch of junk that we buy from cvs.