If it is not explicitly told in following recipe, setting up services are described for Ubuntu 16.04 server, but applications are described for Ubuntu 16.04 and/or Lubuntu 16.04 workstation. If you use different Ubuntu version or Linux distribution, settings as well as content, names and places of configuration files may be different!
Got it.

16. Git branches and merging tools

  1. If necessary, install meld and diffuse tools:

    sudo apt install meld diffuse
  2. Open your project:

    cd ~/workspace/Aaaaaa

    where Aaaaaa is code of your project.

  3. Add, commit and push changes of your project to the bcserver (to be sure you have all your previous work on bcserver).
  4. Add new remote repository https://odo.lv/git/JTM/ to your project:

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

    git fetch upstream branch1:branch1
    git fetch upstream branch2:branch2
  2. Check that your repository has three branches:

    git branch

    returns:

      branch1
      branch2
    * master
  3. Make two copies of your project, for example Aaaaaa1 and Aaaaaa2 as sibling projects in your workspace.
  4. Check out branches in copies of the project:

    cd ~/workspace/Aaaaaa1
    git checkout branch1
    cd ~/workspace/Aaaaaa2
    git checkout branch2
  5. Open meld, and compare content of your original project, e.g. Aaaaaa and Aaaaaa1, copy and save missing parts of content into Aaaaaa project.
  6. Compare content of catbN.txt files in jtm.activity18 package between projects with master and/or branch1/branch2 branches.
  7. Merge content of all numbered filees catbN.txt into single catb.txt file
  8. Check that catb.txt file has proper content by running GitMergeTest1.java unit test.
  9. Before you add, commit and push changes to bcserver, ensure you are working on master branch, e.g. command:

    git branch

    returns:

      branch1
      branch2
    * master

Additional info


  
Tags:
Created by Valdis Vītoliņš on 2020-05-28 13:56
Last modified by Valdis Vītoliņš on 2020-05-28 14:03
 
Xwiki Powered
Creative Commons Attribution 3.0 Unported License