@@ -35,8 +35,8 @@ 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 origin "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 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.
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.
