Extra exercise 13: Git branches and merging tools

  1. Review presentation
  2. Add new remote repository http://odo.lv/git/JTM/ to your project:

    git remote add upstream http://odo.lv/git/JTM/
  3. Pull branches branch1 and branch2 from upstream repository to branches into your repository:

    git fetch upstream branch1:branch1
    git fetch upstream branch2:branch2
  4. Investigate content of org.extra13 package for master branch and branches.
  5. Use diff/merge tools to add content of all catbN.txt files and branches into single catb.txt file. For example:

    git diftool master..branch1
  6. Check that catb.txt file has proper content by running GitMergeTest1.java unit test.

Tagi:
Izveidojis Valdis Vītoliņš 2017-06-16 16:59
Pēdējais mainījis Valdis Vītoliņš 2017-07-07 15:50
 
Xwiki Powered
Creative Commons Attribution 3.0 Unported License