<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
Thanks so much Spencer for doing all this! We should indeed try to
produce a 4.1.1 release in the next days.<br>
<br>
One note, from git 1.7 it is possible to remove a remote branch
with:<br>
<br>
git push <remote> --delete <branch><br>
<br>
See
<a class="moz-txt-link-freetext" href="http://stackoverflow.com/questions/2003505/delete-a-git-branch-both-locally-and-remotely">http://stackoverflow.com/questions/2003505/delete-a-git-branch-both-locally-and-remotely</a><br>
<br>
Jose<br>
<br>
<br>
<br>
<div class="moz-cite-prefix">On 26.06.2015 12:36, Spencer Bliven
wrote:<br>
</div>
<blockquote
cite="mid:CA+P6arksXSoUpuyys2jKaSs63gGYz=fDKqMJOpJNnkB9-uU7oA@mail.gmail.com"
type="cite">
<meta http-equiv="Content-Type" content="text/html;
charset=windows-1252">
<div dir="ltr">
<div>
<div>
<div>
<div>
<div>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.<br>
<br>
</div>
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.<br>
<br>
</div>
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:<br>
<br>
git push <myfork> :minor<br>
<br>
</div>
(where <myfork> gives the name of your git remote;
probably 'origin')<br>
<br>
<br>
</div>
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.<br>
<br>
</div>
-Spencer<br>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
biojava-dev mailing list
<a class="moz-txt-link-abbreviated" href="mailto:biojava-dev@mailman.open-bio.org">biojava-dev@mailman.open-bio.org</a>
<a class="moz-txt-link-freetext" href="http://mailman.open-bio.org/mailman/listinfo/biojava-dev">http://mailman.open-bio.org/mailman/listinfo/biojava-dev</a></pre>
</blockquote>
<br>
</body>
</html>