You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: docs/teamwork.md
-19Lines changed: 0 additions & 19 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -582,8 +582,6 @@ We now have SSH keys set up. Time to test it from your own machine:
582
582
583
583
## Fourth exercise, teamwork, clone, push, pull
584
584
585
-
<!-- .slide: style="font-size: 25px;" -->
586
-
587
585
One of you should create a repository on GitHub and invite their team. Remember, on the GitHub webpage the option to create a new repository is in the top right corner - click the "+". To add members: "Settings" -> "Manage access".
588
586
589
587
1. Each person should create a file in the repository (Add and commit the file)
@@ -598,8 +596,6 @@ One of you should create a repository on GitHub and invite their team. Remember,
598
596
599
597
## Fifth exercise, teamwork, branches and merging
600
598
601
-
<!-- .slide: style="font-size: 28px;" -->
602
-
603
599
1. Each person creates a branch in the repo you created in the previous exercise. You can use `git branch yourbranchname` where you put any name you want for the new branch.
604
600
2. Switch to the new branch with `git checkout yourbranchname`
605
601
3. Create a uniquely named file. Put anything you want in it.
@@ -613,8 +609,6 @@ One of you should create a repository on GitHub and invite their team. Remember,
613
609
614
610
## Sixth exercise, teamwork, branches and merging, pull requests
615
611
616
-
<!-- .slide: style="font-size: 28px;" -->
617
-
618
612
1. Go to the repository on the GitHub page. Submit a pull-request from your branch to the main branch
619
613
2. The owner of the repository (the person who created it) can then accept them and click to merge them.
620
614
3. After doing so, everyone should again do a `git pull` (on the command line)
@@ -626,22 +620,13 @@ One of you should create a repository on GitHub and invite their team. Remember,
626
620
627
621
## Seventh exercise, teamwork and branches
628
622
629
-
<!-- .slide: style="font-size: 28px;" -->
630
-
631
623
1. Everyone in the group create a new branch in the repo - this time you could try doing it from the GitHub page
632
624
2. Check which remote branches exist with `git branch -r`
633
625
3. Check which local branches you have with `git branch`
634
626
4. Use `git status` to see which branch you are on.
635
627
5. Check with `git branch -a` to see all local and remote branches
636
628
6. Do a `git pull` from the command line to get a list of all branches. Switch to the branch you created on GitHub with `git checkout --track origin/mynewbranch`. Again do `git branch` to see which branch you are on.
637
629
7. Create a new file and put some content to it. Add and commit it. Check for changes (`git status`, `git log`). Push the changes.
638
-
639
-
---
640
-
641
-
## Seventh exercise, teamwork and branches - continued
642
-
643
-
<!-- .slide: style="font-size: 30px;" -->
644
-
645
630
8. Try and merge the branches from the command line. Remember to first pull any changes from your other group members. Also remember to switch to the branch you want to merge it to (main in this case).
646
631
9. Were you succesful? Why or why not? Is there are difference between what happens when the owner of the branch tries this and when everyone else does?
647
632
10. After doing this, everyone should again do a `git pull` (on the command line)
@@ -651,8 +636,6 @@ One of you should create a repository on GitHub and invite their team. Remember,
651
636
652
637
## Eighth exercise, deleting branches
653
638
654
-
<!-- .slide: style="font-size: 30px;" -->
655
-
656
639
1. Everyone should now create two more branches in the repo. In each case, switch to the branch, create a file in it, and push the branch
657
640
2. Check which branches exist, remotely and locally
658
641
3. Try and delete a remote branch with `git push origin --delete myownbranch
@@ -664,8 +647,6 @@ One of you should create a repository on GitHub and invite their team. Remember,
664
647
665
648
## Ninth exercise, merge conflicts
666
649
667
-
<!-- .slide: style="font-size: 25px;" -->
668
-
669
650
In this exercise everyone in the team will be working in the same branch, for instance the main branch.
670
651
671
652
Merge conflicts generally happen when two (or more) teammembers edit the same file and the same line, or when one edits a file and another deletes it.
0 commit comments