Skip to content

Commit

Permalink
Fix merge image
Browse files Browse the repository at this point in the history
  • Loading branch information
brittanydionigi committed Jul 15, 2019
1 parent becdb77 commit 3d5957e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lessons/module-2/taming-merge-conflicts.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ What you've been doing so far is considered the **merge** workflow:
* merge commits are generated any time we have to resolve conflicts
* makes it more difficult to read the history

![merge-vs-rebase][merge-vs-rebase]
![merge-workflow][merge-workflow]

[merge-vs-rebase]: /assets/images/lessons/merge-rebase/merge-vs-rebase.png
[merge-workflow]: /assets/images/lessons/merge-rebase/merge-workflow.png


### Rebase Workflow
Expand Down

0 comments on commit 3d5957e

Please sign in to comment.