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
git-guide/merging.md

1.1 KiB
Raw Blame History

Bringing code back together

Merge Requests in Gitlab

Merging via the CLI

Lets take our example of making a branch for issue 99, the diagram below shows the current state of the git repository.

gitGraph
    commit
    commit
    branch issue99
    checkout issue99
    commit
    checkout main
    commit
    commit

Merging this is pretty simple, you can do it with the following instructions.

# Switch back to the main branch
git checkout main

# Merge the branches
git merge issue99

# Push the changes to the remote repository
git push

The diagram below shows what happened to our repository and how it got merged or flattened back into the main branch.

gitGraph
    commit
    commit
    branch issue99
    checkout issue99
    commit
    checkout main
    commit
    commit
	 merge issue99
    commit

Merge conflicts

Follow me for more guides