Closed louisgag closed 9 years ago
Dear Doug, That's weird because I made only 6 tiny tiny changes of one line each, after having updated everything from your main branch. GitHub is new for me as well so I might have missed something ! Hopefully the next one I do will be easier. Thanks, -Louis
Dear Louis, Yes, merge was easy this time, because there were no code conflicts.. I'm learning the workflow. I maintain my git master branch on my local machine at ~/.config/blender/scripts/addons/BlenderAndMBDyn, so that any updates I make locally can be immediately tested. From that subdirectory, if there are no conflicts between our branches, I simply pull your branch for an automatic merge into my local master branch, and then push my local master to my github master. So, in effect, github is a backup of my master. You should be able to have a similar workflow, or perhaps you have already found a workflow that works well for you.
-Doug
Louis,
Merging your pull request was difficult for me, mostly because I'm new to github workflow, but also if you could keep your branch current with mine would be much easier. When you do update, you will see I edited your changes as follows,
-Doug