Git branch cleanup
Moderator: Forum Moderators
- Pentarctagon
- Project Manager
- Posts: 5594
- Joined: March 22nd, 2009, 10:50 pm
- Location: Earth (occasionally)
Re: Git branch cleanup
Unless you're fine with a branch being deleted, I'm not planning to delete it. So:
gui2_floating_textbox
- keepframe_cleanup
- deletelua_stuff
- delete. The command git log master..lua_stuff
returned these commits, which looks like they were added from commits 23aac4f72fafc8c8a0991a614255b9532b3615a1 through c266b355281bdc26241767bf7c9f08f83291a9ef.color_range_deprecate
- Can you check whether this should be merged or not, in that case?wfl_updates
- keepcustomize_objectives
- keep, looks like it's for #2671.wml_error_recovery
- keep, looks like it's for #3233.gui2_help
- keepmove_units_to_core
- keeprel_paths
- keepfix_2647
- keeplua_reorg
- keep99 little bugs in the code, 99 little bugs
take one down, patch it around
-2,147,483,648 little bugs in the code
take one down, patch it around
-2,147,483,648 little bugs in the code
- Celtic_Minstrel
- Developer
- Posts: 2278
- Joined: August 3rd, 2012, 11:26 pm
- Location: Canada
- Contact:
Re: Git branch cleanup
color_range_deprecated
should be merged if and only if the removed syntax of the tip commit:
- Is still removed (or at least deprecated)
- Doesn't have an alternate deprecation message.
On the other hand, it's possible that the syntax change the commit adds a deprecation for is a product of a reverted commit.
I can probably check this out at some point, but it might take me awhile. Feel free to remind me periodically (or even do it yourself).
- Pentarctagon
- Project Manager
- Posts: 5594
- Joined: March 22nd, 2009, 10:50 pm
- Location: Earth (occasionally)
Re: Git branch cleanup
Remaining branches I haven't gotten an answer about:
Code: Select all
renderpath_redo_new - Latest commit 48bcb27 on Mar 19, 2016 - last modification 2016-10-26 - 1 commit ahead, 9539 commits behind master - Vultraz
ping_test_disconnect_detect - Latest commit b325708 on Jan 29, 2017 - last modification 2017-01-30 - 1 commit ahead, 8782 commits behind master - Coffee
tod_manager_handling_refactor - Latest commit 29d9cf2 on Apr 19, 2017 - last modification 2017-04-20 - 1 commit ahead, 7916 commits behind master - Vultraz
display_context_proxy - Latest commit a2d6b9c on Apr 28, 2017 - last modification 2017-04-28 - 1 commit ahead, 7802 commits behind master - Vultraz
preprocessor_cleanup - Latest commit 3a44f58 on Aug 29, 2017 - last modification 2017-09-04 - 1 commit ahead, 6632 commits behind master - Vultraz
unit-types-table - Latest commit d8ae1dc on Jan 28, 2018 - last modification 2018-01-28 - 6 commits ahead, 5586 commits behind master - jyrkive
99 little bugs in the code, 99 little bugs
take one down, patch it around
-2,147,483,648 little bugs in the code
take one down, patch it around
-2,147,483,648 little bugs in the code