Albert

Posts tagged with ‘git’ (2)

How to generate a graph of a repo's git history

Since I was in college I have been quite curious about graphs. I remember when I first saw the Dijkstra’s algorithm my instinctive reaction was to smile. I thought it was such a clever and elegant solution that it was just beautiful. Lately I have been very curious about generative art, in other words, how to generate art using math and code. Actually it all started as real art, which is definitively something I will try out someday in the future.

How to use magit

confidence
certain/highly likely/likely/possible/unlikely/highly unlikely/remote/impossible
importance
9/10

Merge and conflict resolution

  1. Merge with SPC g m and select the patch branch you want to merge
  2. Use SPC g r to call smerge transient state and use n and o accordingly if you want to keep the …