From f76336a8fecbb626accdbf6f7e6ba9f86293d482 Mon Sep 17 00:00:00 2001 From: Stephane Caron Date: Wed, 23 May 2012 16:12:39 -0700 Subject: figures --- .gitignore | 1 + figures/git-merge-conflict.svg | 853 +++++++++++++++++++++++++++++++++++++++ figures/git-merge-ok.svg | 769 ++++++++++++++++++++++++++++++++++++ figures/git-pull-3.svg | 877 ----------------------------------------- 4 files changed, 1623 insertions(+), 877 deletions(-) create mode 100644 figures/git-merge-conflict.svg create mode 100644 figures/git-merge-ok.svg delete mode 100644 figures/git-pull-3.svg diff --git a/.gitignore b/.gitignore index 08efb17..fcb1820 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ *.toc *.synctex.gz *workshop.pdf +.directory diff --git a/figures/git-merge-conflict.svg b/figures/git-merge-conflict.svg new file mode 100644 index 0000000..2c6ce69 --- /dev/null +++ b/figures/git-merge-conflict.svg @@ -0,0 +1,853 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + Commit A + + + + + Commit C + + + + Commit D + + + + Commit B + + + + git pull + + + + Unmergedchanges + + + + + + + + + + + Merge + + + + + Commit E + + + + + manual merge + + + + diff --git a/figures/git-merge-ok.svg b/figures/git-merge-ok.svg new file mode 100644 index 0000000..31ec423 --- /dev/null +++ b/figures/git-merge-ok.svg @@ -0,0 +1,769 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + Commit C + + + + Commit D + + + + Commit B + + + + git pull + + + Commit E + + + + + + + + + + Merge + + + + Commit A + + + + + + diff --git a/figures/git-pull-3.svg b/figures/git-pull-3.svg deleted file mode 100644 index 536e801..0000000 --- a/figures/git-pull-3.svg +++ /dev/null @@ -1,877 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - Commit A - - - - Commit A - - - - Commit C - - - - Commit D - - - - - - Commit B - - - - - - git push - - - git pull - - - - - - Commit B - - - - Commit D - - - - Commit E - - - git push - - - - Commit E - - - - - - - -- cgit v1.2.3-70-g09d2