Closed gildegoma closed 12 years ago
As expected for my learning by doing exercise, pr3 and pr20 conflict. Hot Point: how to handle submodule reference conflicts... ;-)
Boskop private-server (pr3)$ git merge pr20
Auto-merging cookbooks/php
CONFLICT (submodule): Merge conflict in cookbooks/php
Auto-merging cookbooks/apache2
CONFLICT (submodule): Merge conflict in cookbooks/apache2
Auto-merging .gitmodules
CONFLICT (content): Merge conflict in .gitmodules
Automatic merge failed; fix conflicts and then commit the result.
I keep discussion #20 about external cookbook management open, but for now I won't block/disturb branch pr3 (#3 and #16) with this point. new PR from pr20 to master will come when guidelines are adopted
With my little git experience, I preferred this approach compared to: