diff --git a/img/create-merge.png b/img/create-merge.png new file mode 100644 index 0000000..44352b0 Binary files /dev/null and b/img/create-merge.png differ diff --git a/img/explain-merge.png b/img/explain-merge.png new file mode 100644 index 0000000..5e46364 Binary files /dev/null and b/img/explain-merge.png differ diff --git a/img/merged.png b/img/merged.png new file mode 100644 index 0000000..7950466 Binary files /dev/null and b/img/merged.png differ diff --git a/img/ready-merge.png b/img/ready-merge.png new file mode 100644 index 0000000..68243b3 Binary files /dev/null and b/img/ready-merge.png differ diff --git a/merging.md b/merging.md index 84f1c5a..0cae8dc 100644 --- a/merging.md +++ b/merging.md @@ -46,6 +46,9 @@ gitGraph commit ``` --- + +## Merge conflicts + ##### Follow me for more guides [](https://awscommunity.social/@Ric) [](https://www.linkedin.com/in/richarvey/)