-
-
Notifications
You must be signed in to change notification settings - Fork 933
master or 0.3 branch? #178
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Comments
Bringing them back together will be beneficial, even though I wouldn't want to spend the time. Considering the focus will be on 0.3, I suppose there isn't much from master valuable enough to be be ported back. If in doubt, I will put it into a separate branch to conserve it, and make the latest 0.3 the new master. It's a bit sad I lost velocity on the master branch - it had some good ideas, but after all these years starting fresh might be the best thing to do. |
In other words, I'd ignore master and discard it when needed. |
Sounds like a plan. You can fork master to a new branch then craft a merge commit of 0.3 to master which discard all changes coming from master i.e. with:
You can verify that the merge of master to 0.3 with -s ours produced now change:
Then switch master to that new 0.3 branch:
And master is now 0.3 :-) |
Per discussion with Byron, the master branch is obsolete and development should be conducted on 0.3 branch. This merge commit merge master branch to 0.3 discard all changes made in master. That let one later one replace master with 0.3 :-) Fix gitpython-developers#178
I pushed such a commit in my fork https://github.com/hashar/GitPython/tree/obsolete-master might help figuring out what happens. |
If master is being ignored, then are there plans to create a new Pypi.python.org package for GitPython from 0.3? The one currently on there is now over 3 years old (0.3.2-RC1). |
The repository has been updated to default to the 0.3 branch instead of master:
0.3.2 has been released on pypi. |
I noticed the master and 0.3 branches forked back in April 2011 and each have a few different patches.
Would it make sense to release a new 0.3 version then merge 0.3 back in master and work on 0.4 with the resulting merge?
The text was updated successfully, but these errors were encountered: