Skip to content

Instantly share code, notes, and snippets.

View zzl0's full-sized avatar

zzl zzl0

View GitHub Profile
Video editor: https://clideo.com/
sl version
sl clone https://github.com/zzl0/sapling-test.git && cd sapling-test
echo 1 >> a.txt
sl ci -m 'update a.txt'
sl isl
sl push
@zzl0
zzl0 / version_control_diff_patch_merge_analysis.md
Created September 4, 2023 21:47 — forked from CMCDragonkai/version_control_diff_patch_merge_analysis.md
Version Control Diff, Patch and Merge Analysis (mostly Git)

Version Control Diff, Patch and Merge Analysis (mostly Git)

Inspired by this: https://github.com/mndrix/merge-this

Intrafile-Intraline Change

Where branch A and branch B changes 2 different contiguous sets of characters on the same line, but the changes are non-overlapping. Both changes can change the line length arbitrarily.

@zzl0
zzl0 / merger.py
Created September 3, 2023 03:04 — forked from stepchowfun/merger.py
My three-way merge algorithm, originally designed for 6.033 DP2.
#!/usr/bin/python -O
################################################################################
################################################################################
#
# State-Based Text Merging Algorithm
# For 6.033 Design Project 2
# TA: Katherine Fang
# 9 May 2012
#
@zzl0
zzl0 / README.md
Created June 5, 2023 19:58 — forked from borekb/README.md
Why Git doesn't track renames – original email by Linus Torvalds

Why Git doesn't track renames – original email by Linus Torvalds

A copy / backup of Linus' email from 15 Apr 2005.

@zzl0
zzl0 / redash-test.csv
Created November 18, 2020 22:10
redash-test
Date Country/Region Province/State Confirmed Recovered Deaths
2020-01-22 Afghanistan 0 0 0
2020-01-23 Afghanistan 0 0 0
2020-01-24 Afghanistan 0 0 0
2020-01-25 Afghanistan 0 0 0
2020-01-26 Afghanistan 0 0 0
2020-01-27 Afghanistan 0 0 0
2020-01-28 Afghanistan 0 0 0
2020-01-29 Afghanistan 0 0 0
2020-01-30 Afghanistan 0 0 0

GPDB Version

$ git log --all --graph --decorate
* commit ce261a87769335185480b4b0c7f251669018938f (HEAD -> dev, origin/6X_STABLE)
| Author: Lisa Owen <[email protected]>
| Date:   Wed Aug 19 10:32:32 2020 -0700
|
|     docs - clarify gpcopy supported greenplum versions (#10621)