Recommend a git version control model: http://www.juvenxu.com/2010/11/28/a-successful-git-branching-model/
The code you write at the company should belong to the feature branch (feature branch) or development branch (develop), while the code you modify at home belongs to the hotfix branch (hotfix branch). First, create a hotfix branch at home and then merge it into the main branch. Branch (master), and then get the patch from the master branch the next day and merge it into your own development branch.
Recommend a git version control model: http://www.juvenxu.com/2010/11/28/a-successful-git-branching-model/
The code you write at the company should belong to the feature branch (feature branch) or development branch (develop), while the code you modify at home belongs to the hotfix branch (hotfix branch). First, create a hotfix branch at home and then merge it into the main branch. Branch (master), and then get the patch from the master branch the next day and merge it into your own development branch.
There is also a git flow
https://github.com/nvie/gitflow
http://www.jeffkit.info/2010/12/842/
http://jwch.sdut.edu.cn/book/linux/git_flow.html?highlight=flow