search

atkphpframework / achievo

[ARCHIVED] Achievo is a web-based Business Support Services (BSS) application for organizations.
Other
19 stars 20 forks source link

Update atk submodule ref #8

Closed naufraghi closed 11 years ago

naufraghi commented 11 years ago

The previous ref was resulting in:

Cloning into 'atk'...
remote: Counting objects: 2206, done.
remote: Compressing objects: 100% (1760/1760), done.
remote: Total 2206 (delta 381), reused 2206 (delta 381)
Receiving objects: 100% (2206/2206), 3.43 MiB | 1.67 MiB/s, done.
Resolving deltas: 100% (381/381), done.
fatal: reference is not a tree: 5ff8245450d459f451112a405aa34d7b6ee46e04
Unable to checkout '5ff8245450d459f451112a405aa34d7b6ee46e04' in submodule path 'atk'

I resolved it following the "Inside, Out" part of this recipe: Git submodule head 'reference is not a tree' error

dalers commented 11 years ago

Thanks naufraghi. Before I merge your pull-request, what is your opinion on merging new work first into the develop branch, and then merge the develop branch into the master branch for releases (so the master branch always reflects the last stable release). It seems if the develop branch will be left out of date since the pull request merges into master. What do you think?

naufraghi commented 11 years ago

Ok, yes, something like http://nvie.com/posts/a-successful-git-branching-model/.

Perhaps we can explain better in the README file that master is the release/stable branch and that all the pull requests are supposed to be against develop (and reverse at least one arrow in the asciiart in Repository Structure).

I'm going to open a new pull request against the develop branch as soon as possible.