Add conflicts chapter

Signed-off-by: Lays Rodrigues <[email protected]>
gomex · Oct 20, 2021 · c409f3c · c409f3c
1 parent 544919d
commit c409f3c
Show file tree

Hide file tree

Showing 5 changed files with 398 additions and 0 deletions.
diff --git a/manuscript/resources/images/git_merge.png b/manuscript/resources/images/git_merge.png
diff --git a/manuscript/resources/images/git_rebase.png b/manuscript/resources/images/git_rebase.png
diff --git a/manuscript/resources/images/git_rebase_diagram.png b/manuscript/resources/images/git_rebase_diagram.png
diff --git a/manuscript/resources/images/git_rebase_diagram.svg b/manuscript/resources/images/git_rebase_diagram.svg