mirror of
https://gitlab.com/ric_harvey/git-guide.git
synced 2024-11-23 20:24:02 +00:00
add first bit of merging doc
This commit is contained in:
parent
772f9b90e2
commit
38a99c449b
2 changed files with 60 additions and 1 deletions
14
branches.md
14
branches.md
|
@ -65,6 +65,20 @@ git push --set-upstream origin issuse99
|
||||||
|
|
||||||
Now git will push the code to the remote repository and will also know what to do next time you run ```git push```
|
Now git will push the code to the remote repository and will also know what to do next time you run ```git push```
|
||||||
|
|
||||||
|
Our git tree now looks something like this:
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
gitGraph
|
||||||
|
commit
|
||||||
|
commit
|
||||||
|
branch issue99
|
||||||
|
checkout issue99
|
||||||
|
commit
|
||||||
|
checkout main
|
||||||
|
commit
|
||||||
|
commit
|
||||||
|
```
|
||||||
|
|
||||||
## Switching branches in the CLI
|
## Switching branches in the CLI
|
||||||
|
|
||||||
- Open the terminal
|
- Open the terminal
|
||||||
|
|
47
merging.md
47
merging.md
|
@ -1,5 +1,50 @@
|
||||||
## Merging
|
# 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.
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
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.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
gitGraph
|
||||||
|
commit
|
||||||
|
commit
|
||||||
|
branch issue99
|
||||||
|
checkout issue99
|
||||||
|
commit
|
||||||
|
checkout main
|
||||||
|
commit
|
||||||
|
commit
|
||||||
|
merge issue99
|
||||||
|
commit
|
||||||
|
```
|
||||||
---
|
---
|
||||||
##### Follow me for more guides
|
##### Follow me for more guides
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue