ric/git-guide
1
0
Fork 0
mirror of https://gitlab.com/ric_harvey/git-guide.git synced 2024-11-23 20:24:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding merge images for gitlab

Browse source
This commit is contained in:
Ric Harvey 2024-05-03 17:32:19 +01:00
parent b22137f710
commit 1cdc75a0c2
Signed by: ric
GPG key ID: CD63CE502B962F16
5 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
img/create-merge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 54 KiB

BIN
img/explain-merge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 144 KiB

BIN
img/merged.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
img/ready-merge.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 169 KiB

3
merging.md
View file

@ -46,6 +46,9 @@ gitGraph
commit commit
``` ```
--- ---
## Merge conflicts
##### Follow me for more guides ##### Follow me for more guides
[<img src="./img/mastodon.png" width="4%">](https://awscommunity.social/@Ric) [<img src="./img/linkedin.png" width="4%">](https://www.linkedin.com/in/richarvey/) [<img src="./img/mastodon.png" width="4%">](https://awscommunity.social/@Ric) [<img src="./img/linkedin.png" width="4%">](https://www.linkedin.com/in/richarvey/)