use rebase
study ubuntu
study git on server
...
not clear about server
Merge branch 'gitonserver'
Merge branch 'linux'