vimwiki

use git on local

1. in the directory you want to track

    git init
   

2. add the files to track

    git add <filname>
    or 
    git add .
   

3. commit to initialise a main branch

   git commit -m  "comment"
   

4. create a new branch

    git branch <new branch>
   

5. merge the branches, in terminal in the branch to merge with (ex: master)

    // in branch mater
    git merge <branch to merge with master>