Skip to content
Snippets Groups Projects
Commit 2e7a5932 authored by kainguyen's avatar kainguyen
Browse files

fixed another detail I missed

parent fd6fe4bc
No related branches found
No related tags found
1 merge request!1Updated read me with merge info
This commit is part of merge request !1. Comments created here will be created in the context of that merge request.
......@@ -40,3 +40,7 @@ To push your local changes to remote git: git push --set-upstream origin Branch-
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment