[Matlab-emacs-discuss] move -->github: rebase, and which branches could be deleted

[Uwe B. <ou...@ma...>]

Hi all (especially Eric)


As you maybe aware of, we plan to move the development to github. That
is a good moment, to think about cleaning up a bit the repository, like
rebasing and deleting old merged branches.

The idea is once we agree, I would push a test, but public repository to my own
github account so that everybody can have a look and if everything is
alright it will then be pushed to its new «home», and we will leave a
note in sourceforge.

    1. I would like to rename the principal branch, «default» (instead of
       master). That simplify things quite a bit on my side, besides the
       name master is hm, controversial, a lot of repositories call the
       principal branch now, «main», but on technical reasons I prefer,
       «default» 

    2. The actual git branches

       - Git branch -a tells me 
,----
| 
| * master
|   remotes/origin/HEAD -> origin/master
|   remotes/origin/copyright
|   remotes/origin/documentation
|   remotes/origin/fill-fix
|   remotes/origin/font-lock
|   remotes/origin/fontlockhang
|   remotes/origin/hairyblocks
|   remotes/origin/mac_init
|   remotes/origin/master
|   remotes/origin/matlab-cells
|   remotes/origin/modernize
|   remotes/origin/org-mode
|   remotes/origin/shell-patch
|   remotes/origin/shellcomplete
|   remotes/origin/strings
|   remotes/origin/usage1
|   remotes/origin/wisent-parser
`----


    - while  git branch -r --no-merged origin/master results in 
,----
| 
|   origin/copyright
|   origin/fill-fix
|   origin/fontlockhang
|   origin/matlab-cells
|   origin/org-mode
|   origin/shellcomplete
|   origin/wisent-parser
`----

So 7 branches are actually not merged and can't be deleted without
loosing the commits. 



    1. I created

       - copyright, (to sort out the issue with the FSF papers and having
         the repository in ELPA, not MELPA)

       - fill-fix a branch for testing and trying to improve the filling of
         comments, and inline comments.

       - org-mode a branch for testing who the matlab-shell could
         interact with org mode.

    2. Nidish created matlab-cells, which hopefully soon will be merged
       into master/default.

    3. Eric created the rest. So Eric, is it ok if I delete all the
       branches that are *not* merged into master?


Once that is settled, I rename master-->default, do some rebasing and
push the result to a test repository in github.

Regards

Uwe 










-- 
I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel
I strongly condemn Putin's war of aggression against Ukraine.
I support to deliver weapons to Ukraine's military. 
I support the EU and NATO membership of Ukraine.