Exercise - Fetch and Pull

Tips

  • git fetch fetches changes without integrating
  • git status shows differences on the current branch
  • git branch -r shows which remote branches exist.
  • git pull integrates (first fetch, then merge)
  • git log --graph --oneline shows the graph with merges

Setup

Step 0 - START 

$ cd mein-klon


Step 1 - Fetch changes

Start in directory git-uebungen/aufgaben/zusammenarbeit-push-fetch-pull/mein-klon.

Fetch the two new commits from the origin repository without changing the local main.

Step 2 - Examine changes

Start in directory git-uebungen/aufgaben/zusammenarbeit-push-fetch-pull/mein-klon.

Show the status, and then examine which commits are present in the main of the origin repository, which have not yet been integrated into the local main.

Step 3 - Integrate changes

Start in directory git-uebungen/aufgaben/zusammenarbeit-push-fetch-pull/mein-klon.

Integrate the latest commits from the origin repository into the local main.

mein-klon $ cd ..


To the solution

To the overview