... | ... | @@ -11,7 +11,7 @@ On the "master" branch we will have a stable version of our code base. On the "d |
|
|
4. `git add YOUR-FILE`
|
|
|
5. `git commit -m "TELL US WHAT YOU CHANGED"`
|
|
|
6. `git push --set-upstream origin BRANCH-WITH-FUNCTIONAL-NAME`
|
|
|
7. Then you can create a new merge request. for that you go to gitlab and on the left-side-navigation you find the section "Merge Requests"
|
|
|
7. Then you can create a new merge request. for that you go to gitlab and on the left-side-navigation you find the section "Merge Requests" <br/>
|
|
|
![image](uploads/5d22faf70e8abd6302b9edee5791338c/image.png)
|
|
|
8. Click on create new merge request
|
|
|
9. Select the source branch - that is the branch you just pushed so BRANCH-WITH-FUNCTIONAL-NAME and set the target branch to "develop" e.g. ![image](uploads/6044834b961f6d6cfb80c16c35825e77/image.png)
|
... | ... | @@ -24,7 +24,7 @@ With that, we ensure that we always have a stable fallback |
|
|
|
|
|
## Git in the IntelliJ terminal / Terminal
|
|
|
|
|
|
at the bottom left you have a terminal, open it
|
|
|
at the bottom left you have a terminal, open it <br/>
|
|
|
![image](uploads/e2f7ee733cc5bbced4529ec542b9a1ec/image.png)
|
|
|
|
|
|
with
|
... | ... | @@ -43,7 +43,7 @@ after that you should find your changes on your branch on gitlab and you can ope |
|
|
with
|
|
|
`git branch`
|
|
|
you see on which branch you are at the moment and what other branches you have
|
|
|
![image](uploads/255bb02ce22b699a2d11a4a03e4e70b8/image.png)
|
|
|
![image](uploads/255bb02ce22b699a2d11a4a03e4e70b8/image.png) <br/>
|
|
|
this example above shows that I am currently on branch "update-work"
|
|
|
|
|
|
to check out a different branch like for example the develop branch. you need to commit your changes the way you used to do it on your branch.
|
... | ... | |