When I start a new project based on a nice starter kit like this Angular 2 one. How do you keep up with changes to a base repo like this?
I know that it is a 'starter', but it would be nice to merge smart new insights from the starter kit into my own code base. What's the most commonly used Git workflow to do this?
I mean, I add my code and change maybe a lot of files in the meantime. How do other developers handle this without spending hours solving all kinds of merge conflicts etc. Any special kinds of branching/remotes/sub repo's?