Skip to content

GitLab

Git Workshop · Changes

Page history
Add merge command summary branch notes authored by Thomas Kennedy's avatar Thomas Kennedy
Hide whitespace changes
Inline Side-by-side
Git-Workshop.md
View page @ 686ad2c2
...@@ -2160,6 +2160,9 @@ were used for code cleanup based on code linting and style analysis tools. ...@@ -2160,6 +2160,9 @@ were used for code cleanup based on code linting and style analysis tools.
The three *style cleanup* branches were eventually merged into `f19-prep`. The The three *style cleanup* branches were eventually merged into `f19-prep`. The
`f19-prep` branch was later merged into `f19` and `master`. `f19-prep` branch was later merged into `f19` and `master`.
> The [`git merge` command](https://git-scm.com/docs/merge-strategies) warrants
> its own discussion. The command will be discussed, if time permits.
--- ---
## Workflow Example 2 - This Presentation ## Workflow Example 2 - This Presentation
......