Hi everyone, if we do migrate to git, we should have a branching scheme for the project. I would suggest we just go with git flow (http://nvie.com/posts/a-successful-git-branching-model/). It is widely used, well documented, lots of people are familiar with it and we don't have to come up with our own rules or patterns. I expect that we probably won't be using the hotfix stuff much, if at all. The feature branches would simply be the pull requests of everyone against the develop branch. Whoever manages releases (and I would volunteer for that for a while) would have to follow the release branch stuff, but that also is not too involved. Any thoughts? Best, David
I have found git-flow to be a good starting point for building a workflow. Cases it doesn't cover or parts of it that cause problems for the contributors of this project may be discovered, at which point deviation/modification should be considered. Are you suggesting using the gitflow project [ https://github.com/nvie/gitflow/wiki] to support the work flow, or just using the described branching scheme? On Wed, Dec 4, 2013 at 9:45 AM, davidacoder <davidacoder@hotmail.com> wrote:
Hi everyone,
if we do migrate to git, we should have a branching scheme for the project. I would suggest we just go with git flow (http://nvie.com/posts/a-successful-git-branching-model/). It is widely used, well documented, lots of people are familiar with it and we don't have to come up with our own rules or patterns.
I expect that we probably won't be using the hotfix stuff much, if at all. The feature branches would simply be the pull requests of everyone against the develop branch. Whoever manages releases (and I would volunteer for that for a while) would have to follow the release branch stuff, but that also is not too involved.
Any thoughts?
Best, David _________________________________________________ Python.NET mailing list - PythonDotNet@python.org https://mail.python.org/mailman/listinfo/pythondotnet
I think just using the branching scheme? For most people it would just boil down to that themain branch is called develop and that pull requests are made against that one, right? And if we do manage to do official releases we would know how to handle that in terms of branches. From: PythonDotNet [mailto:pythondotnet-bounces+davidacoder=hotmail.com@python.org] On Behalf Of Zane D. Purvis Sent: Thursday, December 5, 2013 11:34 AM To: A list for users and developers of Python for .NET Subject: Re: [Python.NET] Branching scheme I have found git-flow to be a good starting point for building a workflow. Cases it doesn't cover or parts of it that cause problems for the contributors of this project may be discovered, at which point deviation/modification should be considered. Are you suggesting using the gitflow project [https://github.com/nvie/gitflow/wiki] to support the work flow, or just using the described branching scheme? On Wed, Dec 4, 2013 at 9:45 AM, davidacoder <davidacoder@hotmail.com <mailto:davidacoder@hotmail.com> > wrote: Hi everyone, if we do migrate to git, we should have a branching scheme for the project. I would suggest we just go with git flow (http://nvie.com/posts/a-successful-git-branching-model/). It is widely used, well documented, lots of people are familiar with it and we don't have to come up with our own rules or patterns. I expect that we probably won't be using the hotfix stuff much, if at all. The feature branches would simply be the pull requests of everyone against the develop branch. Whoever manages releases (and I would volunteer for that for a while) would have to follow the release branch stuff, but that also is not too involved. Any thoughts? Best, David _________________________________________________ Python.NET mailing list - PythonDotNet@python.org <mailto:PythonDotNet@python.org> https://mail.python.org/mailman/listinfo/pythondotnet
participants (2)
-
davidacoder -
Zane D. Purvis