On Tue, 19 Oct 2010, Logan Sorenson wrote:
On Tue, Oct 19, 2010 at 10:58 AM, Robert Cimrman cimr...@ntc.zcu.cz wrote: <snip>
The official sfepy github repo. My github account may at times contain commits I will revert/amend later etc.
As for rebasing, IMHO the numpy discussion converged on that it is always better to rebase prior to merging to resolve possible conflicts locally within a feature branch. Then the merge will be clean. --no-ff makes the branch visible for future, that's the only difference I am aware off. I have used tags for this purpose...
Ok, just to make sure it's correct in the docs, that means you (Robert) will always always rebase before merging with master. But it's still a good idea for the developer contributing a patch or entire branch to rebase off the latest available master at that time to make it easier on you.
Exactly, I could not summarize it better :)
I'll turn my attention to the build system then. :)
Great, many thanks!
r.