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

Quote:
Originally Posted by Nickotte View Post
but what about when I have to submit a feature? I would need to strip the branch of all the unnecessary conflicts.
My workflow work best when I want to make a small fix. If you want to work on a feature then you still can do it in a separate branch. All you need is that private changes should remain unstaged and kept in a separate branch. That works well if you have a different project files and some small patches which do not conflict with your feature, i.e. it works great with .gitignore or C::B project.

You can look at example in `git help reset` under `interrupted workflow`.

Last edited by vvsgh; 23-06-16 at 19:35.
vvsgh is offline   Reply With Quote