+[2017-03-19T11:55:58Z]IronFiretobiasvl: ahh, thx! its a binary, should i make a .gitignore in the submodule to ignore it? +[2017-03-19T11:57:16Z]tobiasvlIronFire: yeah, probably, if you want to ignore it! of course, adding a .gitignore will also make the submodule dirty, so then you should probably stage and commit the .gitignore file +[2017-03-19T12:04:35Z]IronFiretobiasvl: ok just finished, thx soo much, been stuck on that for hrs +[2017-03-19T12:28:55Z]lingocan i use another persons repo as a submodule in mine? +[2017-03-19T12:40:04Z]Seveasyes, you can
IronFire: so either untracked files or uncommitted changes
+[2017-03-20T00:27:47Z]Cxcfhey guys, I'm having trouble understanding the relationship between branches workflow. As far as I'm aware, its a good idea to make a 'dev' branch, then make feature branches, then as the features are completed, merged to dev, which is then merged to master. Is that correct? +[2017-03-20T08:24:29Z]gitinfoCxcf: [!gitflow] The description of the gitflow branch workflow model is at http://nvie.com/posts/a-successful-git-branching-model/ while a tool to help implement this workflow is at https://github.com/petervanderdoes/gitflow See http://sethrobertson.github.com/GitBestPractices/#workflow for other workflow suggestions/references +[2017-03-20T08:24:29Z]tobiasvlCxcf: !flow +[2017-03-20T08:24:44Z]tobiasvlCxcf: !workflow +[2017-03-20T08:24:44Z]gitinfoCxcf: Finding the right workflow for you is critical for the success of any SCM project. Git is very flexible with respect to workflow. See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.