Skip to content
GitLab
Explore
Sign in
This is an archived project. Repository and other project resources are read-only.
degrowth
scriptorium
Wiki
gitWorkflows
gitWorkflows
· Changes
Page history
more merging details/workflow
authored
Nov 21, 2015
by
Gualter
Hide whitespace changes
Inline
Side-by-side
gitWorkflows.md
View page @
9172402f
...
...
@@ -62,6 +62,13 @@ Then:
1.
Select deployment instead of master for comparing branches
1.
Merge them, if there are no conflicts (otherwise check below)
> Note: once the issue is successfully fixed or the story completed (and tested) it is safe to delete the originating branch
And finally don't forget to keep your local repository in sync:
git checkout deployment
git pull
#### Merge locally
git checkout deployment
...
...