From edf540bd820696c878cb6dac0fcef1dcf99434c0 Mon Sep 17 00:00:00 2001 From: kainguyen <kainguyen@vt.edu> Date: Wed, 23 Oct 2024 12:47:28 +0000 Subject: [PATCH] Updated read me with merge info --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 139feac..f0d0d82 100644 --- a/README.md +++ b/README.md @@ -28,3 +28,19 @@ docker build --platform=linux/amd64 -t container.cs.vt.edu/fhurtado14/corps-dire docker push container.cs.vt.edu/fhurtado14/corps-directory/frontend:latest Go to CS Launch and scale down backend deployment to 0, then scale back up to 1. + +# Steps to create a branch and merge request on git lab + +To make a branch do: git checkout -b Branch-Name + +Go into your branch: git checkout Branch-Name + +To push your local changes to remote git: git push --set-upstream origin Branch-Name + +To merge go to GitLab. Click merge request tab. Click new merge request. Fill out the information. Assign to members if you want branch to be tested before merged. They will have to approve your branch in order for it to be merged. Make sure you check "delete source branch when merge request is accepted" and "squash commits when merge request is accepted." + +If you are assigned a merge-request you can view them on the merge-request tab on GitLab. You will have to switch to their branch by doing git checkout Branch-Name to test their branch. Note: You can only switch to their branch if you have pulled in an up to date main branch. For example let's say I did a "git push --set-upstream origin test-branch" so it could connect with git. If I did that after you last pulled, then you won't be able to switch into it until you git pull again. + +After merge happens: +Switch back to main: git checkout main +Pull changes from remote repository: git pull origin main -- GitLab