Loading README.md +15 −15 Original line number Diff line number Diff line Loading @@ -48,8 +48,8 @@ $ git status ``` ### Steps for group A 1. Create new branch ```dollar-convertor``` based on ```master``` 1. Implement the class ```DollarConvertor``` 1. Create new branch ```dollar-converter``` based on ```master``` 1. Implement the class ```converter``` 1. Commit your work ```bash Loading @@ -59,10 +59,10 @@ $ git status $ git commit -m "Implementation of dollar converter" ``` 1. Now push ```dollar-convertor``` branch to **your** repository 1. Now push ```dollar-converter``` branch to **your** repository ```bash $ git push origin dollar-convertor $ git push origin dollar-converter ``` Now imagine you also need a euro converter, however your colleage from group B already implemented it. Loading @@ -74,19 +74,19 @@ How do we "borrow" that code and how do we move it to your repository? ```bash $ git remote add another <place the address here> ``` 1. Conviniently place Euro convertor into your ```dollar-convertor``` branch 1. Conviniently place Euro converter into your ```dollar-converter``` branch ```bash $ git pull sneaky eur-convertor $ git pull sneaky eur-converter ``` 1. Inspect the current state of your repository 1. Push to your ```dollar-convertor``` branch at Gitlab 1. Push to your ```dollar-converter``` branch at Gitlab 1. Go your Gitlab repository and create merge-request to your **master** branch. ### Steps for group B 1. Create new branch ```euro-convertor``` based on ```master``` 1. Implement the class ```EuroConvertor``` 1. Create new branch ```euro-converter``` based on ```master``` 1. Implement the class ```EuroConverter``` 1. Commit your work ```bash Loading @@ -95,26 +95,26 @@ How do we "borrow" that code and how do we move it to your repository? $ git status $ git commit -m "Implementation of euro converter" ``` 1. Now push ```euro-convertor``` branch to **your** repository 1. Now push ```euro-converter``` branch to **your** repository ```bash $ git push origin euro-convertor $ git push origin euro-converter ``` Now imagine you also need a dollar converter, however your colleage from group A already implemented it. How do we "borrow" that code and how do we move it to your repository? 1. Get the address of your clleague's repository 1. Get the address of your colleague's repository 1. Add that repository as another **remote** to **your local** repositor, name it ```sneaky``` ```bash $ git remote add sneaky <place the address here> ``` 1. Conviniently place Euro convertor into your ```eur-convertor``` branch 1. Conviniently place Euro converter into your ```eur-converter``` branch ```bash $ git pull sneaky eur-convertor $ git pull sneaky eur-converter ``` 1. Inspect the current state of your repository 1. Push to your ```eur-convertor``` branch at Gitlab 1. Push to your ```eur-converter``` branch at Gitlab 1. Go your Gitlab repository and create merge-request to your **master** branch. Loading
README.md +15 −15 Original line number Diff line number Diff line Loading @@ -48,8 +48,8 @@ $ git status ``` ### Steps for group A 1. Create new branch ```dollar-convertor``` based on ```master``` 1. Implement the class ```DollarConvertor``` 1. Create new branch ```dollar-converter``` based on ```master``` 1. Implement the class ```converter``` 1. Commit your work ```bash Loading @@ -59,10 +59,10 @@ $ git status $ git commit -m "Implementation of dollar converter" ``` 1. Now push ```dollar-convertor``` branch to **your** repository 1. Now push ```dollar-converter``` branch to **your** repository ```bash $ git push origin dollar-convertor $ git push origin dollar-converter ``` Now imagine you also need a euro converter, however your colleage from group B already implemented it. Loading @@ -74,19 +74,19 @@ How do we "borrow" that code and how do we move it to your repository? ```bash $ git remote add another <place the address here> ``` 1. Conviniently place Euro convertor into your ```dollar-convertor``` branch 1. Conviniently place Euro converter into your ```dollar-converter``` branch ```bash $ git pull sneaky eur-convertor $ git pull sneaky eur-converter ``` 1. Inspect the current state of your repository 1. Push to your ```dollar-convertor``` branch at Gitlab 1. Push to your ```dollar-converter``` branch at Gitlab 1. Go your Gitlab repository and create merge-request to your **master** branch. ### Steps for group B 1. Create new branch ```euro-convertor``` based on ```master``` 1. Implement the class ```EuroConvertor``` 1. Create new branch ```euro-converter``` based on ```master``` 1. Implement the class ```EuroConverter``` 1. Commit your work ```bash Loading @@ -95,26 +95,26 @@ How do we "borrow" that code and how do we move it to your repository? $ git status $ git commit -m "Implementation of euro converter" ``` 1. Now push ```euro-convertor``` branch to **your** repository 1. Now push ```euro-converter``` branch to **your** repository ```bash $ git push origin euro-convertor $ git push origin euro-converter ``` Now imagine you also need a dollar converter, however your colleage from group A already implemented it. How do we "borrow" that code and how do we move it to your repository? 1. Get the address of your clleague's repository 1. Get the address of your colleague's repository 1. Add that repository as another **remote** to **your local** repositor, name it ```sneaky``` ```bash $ git remote add sneaky <place the address here> ``` 1. Conviniently place Euro convertor into your ```eur-convertor``` branch 1. Conviniently place Euro converter into your ```eur-converter``` branch ```bash $ git pull sneaky eur-convertor $ git pull sneaky eur-converter ``` 1. Inspect the current state of your repository 1. Push to your ```eur-convertor``` branch at Gitlab 1. Push to your ```eur-converter``` branch at Gitlab 1. Go your Gitlab repository and create merge-request to your **master** branch.
