[Biojava-dev] Dropping minor and patch branchs; Commit new code to master

[Jose Manuel Duarte]

Thanks so much Spencer for doing all this! We should indeed try to 
produce a 4.1.1 release in the next days.

One note, from git 1.7 it is possible to remove a remote branch with:

git push <remote> --delete <branch>

See 
http://stackoverflow.com/questions/2003505/delete-a-git-branch-both-locally-and-remotely

Jose



On 26.06.2015 12:36, Spencer Bliven wrote:
> Since the 4.0.0 release we've been trying to maintain separate 
> branches for patches (4.0.x), minor changes (4.x.0) and major api 
> (5.0.0). As the main proponent of this organization, I think I can say 
> this was an incredibly bad idea for our project size and development 
> style.
>
> So, as part of the 4.1.0 release I've merged these branches. Please 
> base all future development on the 'master' branch. If you want to 
> make major changes to that API that should go into BioJava 5.0, start 
> a named feature branch like 'biojava-5.0.0-dev'. Likewise, if we need 
> a patch release to go out asap, we can cherry-pick individual commits 
> to a specific branch for that release. This should significantly 
> reduce the overhead of managing git history, as well as eliminate all 
> those crazy merges between branches after each commit.
>
> To update your local repositories, merge all your branches into 
> biojava/master. After merging, you should be able to safely delete the 
> minor and patch branches. If you have a github fork, you can delete 
> those remote branches with the command:
>
> git push <myfork> :minor
>
> (where <myfork> gives the name of your git remote; probably 'origin')
>
>
> Note that the 4.1.0 release is on maven now, but this misses some 
> commits that were on the master branch but not minor. We'll do a quick 
> 4.1.1 release to rectify this.
>
> -Spencer
>
>
> _______________________________________________
> biojava-dev mailing list
> biojava-dev at mailman.open-bio.org
> http://mailman.open-bio.org/mailman/listinfo/biojava-dev

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.open-bio.org/pipermail/biojava-dev/attachments/20150626/10b976ad/attachment.html>