Reduce number of branches

[akorosov]

Problem There are too many branches. Some branches are wrongly branched from other issue branches, some are obsolete #### Solution Remove old branches

[mortenwh]

Be careful before you remove any branches. Please don't delete anything before we have gone through them together....

…

On 14 December 2017 at 14:11, Anton Korosov ***@***.***> wrote: Problem There are too many branches. Some branches are wrongly branched from other issue branches, some are obsolete Solution Remove old branches — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#200>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAGqBTe3ssUIFckL_0zBw0_mWF1BUkpRks5tAR58gaJpZM4RCCl4> .

-- T.: (+47) 915 47 844

[aleksandervines]

I suggest to remove:

• the two branches for issue 54. issue 54 has been closed as "wontfix".
• branches for issues 63/66/70/71/72/74/75/77/79/81/82/84/86/92/106/114/115/117/118/119/156/157 - issues have been closed and all commits merged into develop or master.
• pythesint/add_mapper_tests - not sure what these branches are, but it does not contain anything not in master

[mortenwh]

Points 1 and 2 ok with me. Is the last point about nansat? Can you add a link?

Apart from that, I am unsure about what to do with the branch issue113-get_transect-reverted-for-qp-paper - this is a version that was used for a paper which is now published. The last commit is 0f8ffa3 - as long as the hash code is (now) logged I guess the branch can be deleted, right?

[aleksandervines]

point 3 is about 2 branches in nansat, one named pythesint and one named add_mapper_tests :) I can see the confusion in how I wrote it.

edit: and yes, seems to be safe to delete the issue113 branch you mentioned.

[aleksandervines]

I further suggest to remove these branches, they are some commits ahead of master/develop, but that could be due to "wrong" git usage during the merge.

• issue 60 branches, it is regarding issue 60 about online documentation, which is closed. It says it is 10 commits behind master, but this must be outdated (3-4 years old), we are currently updating the online documentation. Last commits in each branch 0ceacc6 fcbe0ea 23b6650
• issue 76 branch. The issue is closed. I assume that any relevant stuff has been merged, and in either case last commit: db0f3c5
• issue 99 brances. Issue closed and merged in bb9aa96 last commits: a37c8f6 7bd4e2f
• issue 113 branch. Issue closed. last commit: 0f8ffa3
• test-pyqt. Not directly connect to an issue. The only modification done in this is in the travis configuration, removing specific qt version pinning. This branch seems useless now, as I assume the only use of it was to see how travis behaved.

[akorosov]

All of these branches can be deleted. Thanks, @alevin!

[aleksandervines]

Everything above is deleted.

Comments on remaining stale branches:

• issue91-nansattest - There seems to be tests here that might be useful to merge into develop. develop...issue91-nansattest should be reviwed and parts merged as a part of Increase test coverage #91
• issue123-fillValue Might contain useful code for Wrong _FillValue in exported netcdf #123 but I think this reference should do and we can delete the branch as a lot of the code has probably changed since. Last/only commit: 42cad4f this commit is also in Problem with _FillValue when resizing #42
• issue39-SARcomplexdata hard to say for me
• issue98-legendImage newer version is in issue98-legendImage-develop, so issue98-legendImage can safely be deleted
• issue98-legendImage-develop seems useful for nansat.figure.Figure should have a method to return a legend/colorbar as a separate image #98
• issue58-update newer version is in issue58-update-develop, so issue58-update can safely be deleted
• issue58-update-develop looks useful for Make functions for removing and updating a band or several bands #58
• issue42 - looks useful for Problem with _FillValue when resizing #42
• dev_doppler_vm @mortenwh

[akorosov]

• issue91-nansattest - is outdated and can be deleted.
• issue123-fillValue - I agree with @aleksandervines
• issue39-SARcomplexdata - is outdated and can be deleted.
• issue98-legendImage - I agree with @aleksandervines
• issue98-legendImage-develop - has wrong implementation. Can be deleted.
• issue58-update - I agree with @aleksandervines
• issue58-update-develop - is outdated and can be deleted.
• issue42 - is outdated and can be deleted.

[aleksandervines]

Will delete them.
Last one, @mortenwh - dev_doppler_vm ?

[mortenwh]

I have now deleted the branch dev_doppler_vm

[aleksandervines]

Everything should now be cleaned up. It should be no need to merge any branches, as previously suggested.

For reference for #42 this is the last commit in the deleted issue42 branch. 2749467