From 24450e6adcf4488ad4eb85012e8542ae6e0ac902 Mon Sep 17 00:00:00 2001
From: Eric Kooistra <kooistra@astron.nl>
Date: Tue, 25 Feb 2020 09:13:07 +0100
Subject: [PATCH] Added description of review using gitlab.
---
.../doc/prestudy/desp_howtools_erko.txt | 34 +++++++++++++++----
1 file changed, 27 insertions(+), 7 deletions(-)
diff --git a/applications/lofar2/doc/prestudy/desp_howtools_erko.txt b/applications/lofar2/doc/prestudy/desp_howtools_erko.txt
index aa73321a0a..be7d4a6fd4 100755
--- a/applications/lofar2/doc/prestudy/desp_howtools_erko.txt
+++ b/applications/lofar2/doc/prestudy/desp_howtools_erko.txt
@@ -114,6 +114,7 @@ git clone git@git.astron.nl:desp/args.git
git clone git@git.astron.nl:desp/sampy.git
git status # what is in stage area and what is modified
+git status -uno # skip unversioned files
Three areas:
* working tree # local directory tree
@@ -152,7 +153,10 @@ git merge <branch name> # Fast forward merge of branch name to master if there i
# Three way merge combine the differences of the branch and the master
# compared to their common version, this can lead to merge conflicts if
# changes on both branches occur at same parts of a file.
-git branch --merged # show branches that ghave been merged to master
+git branch --merged # show branches that have been merged to master
+git branch -r
+git branch -a # show all local and remote branches
+
git branch -d <branch name> # remove branch
git checkout <commit hash> # detached HEAD because it points to a version not a branch
git branch <branch name> # start a branch from the commit hash, HEAD is attached again
@@ -198,7 +202,7 @@ git status
# delete branch and fetch npstream if the pull request was accepted
git remote remove <remote name> # remove a remote repo
-Review process
+Review process using Gitlab and Git
* Jira ticket defines the work to be done
* coder works on branch with Jira ticket number
@@ -206,8 +210,19 @@ Review process
request makes github automatically issue a regression test in the cloud)
* coder does merge request to reviewer
* gitlab will warn if the branch will lead to a merge conflict, the coder then
- first has to fix the merge conflict by merging the master to the branch.
- The merge can use merging or rebasing, Ger typically uses merging.
+ first has to fix the merge conflict by merging the master to the branch:
+ The merge can use merging or rebasing, Ger typically uses merging. On local
+ machine the coder resolves the merge conflict:
+
+ git checkout master
+ git pull
+ git checkout stat-313
+ git merge master
+ git status # to see merge conflicts, edit file to solve merge conflict
+ git add file
+ git commit
+ git push
+
* reviewer reviews the code per line and in general comments in gitlab GUI,
so no need to pull the branch locally
* Use 'Open in Web IDE' button to see max about 10 changes, Use 'Changes' menu
@@ -217,7 +232,14 @@ Review process
notified by gitlab
* when review is done then the reviewer does the merge.
* the merge automatically deletes the branch (if selected to do so in gitlab)
- locally the coder manually needs to delete the branch
+ locally the coder manually needs to delete the branch:
+
+ git branch
+ git checkout master
+ git status
+ git branch -d stat-313
+ git status
+
* Use Jira tag in commit message to have link between GIT and Jira. The link
was made via Settings/Intergations/Jira
@@ -228,8 +250,6 @@ Note:
because typically only one coder works on a branch.
-
-
*******************************************************************************
* Confluence:
*******************************************************************************
--
GitLab