View Single Post
Old 23-06-16, 17:17   #2002
vvsgh
Student
 
Join Date: Jun 2015
Posts: 123
Default

Quote:
Originally Posted by Nickotte View Post
Could you please elaborate as to what this means?
Ok, that's how I do it. I have a separate local branch where all my private modifications are stored. Every time master branch changes I rebase that local branch on it. Now I can reset my local master to origin without changing the workspace. Any changes will remain unstaged and should be added explicitly. After that it can be pushed to published branch. All my local changes are still kept in the local branch in my repository.
vvsgh is offline   Reply With Quote