Reputation: 41
I am beginner in Git & Github. I need help with good/ ways to handle maintaining code base for python 2.7 and python 3. Currently we have written our code to work with python 2.7. But we are porting it to Python 3.6. We still need to maintain and run the application in 2.7 and do some bug fixes as and when this comes. I need help on how to handle this situation and detailed explanation of maintaing branches/ releases.
Currently there is just 1 master branch. Based on features that come in we create branch work on it and do a merge to master. I have not tried anything to handle releases or how to handle the 2.7 bug fixes
Upvotes: 3
Views: 221
Reputation: 1327574
While this question or the blog post "Support Py2+3 in two separate codebases: How to do it and why it’s great" both suggests separate branches or codebase (repositories), their different nature means: no merge. Tags are not involved.
So if you have a bugfix which could be retrofitted between python2 and python3, you would make a patch and apply it to your other branch or repository.
Upvotes: 1