Note to myself - order of branches #353
hiker
started this conversation in
Discussion
Replies: 0 comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
Just to remind me in which order the branches need to be merged. Due to merging issues/errors, I have a few left-over branches, that I'll leave around for now in case that something else comes up later.
linker-lib-flags2 (done in develop). DONE
additional_compilers_clean (done in develop, submitted for main) DONE
psyclone_3_support_clean (done in develop) DONE
very_new_and_fully_clean_shell_tool (done in develop, PR for main now submitted) --> redo of the branch since add_shell_tool_clean had full developed merged in incorrectly, adding future PRs :( DONE
update_to_fparser_0_2 (done in develop) --> for main merged into standalone_update_to_fparser_0.2 DONE
more_linker_wrapper_improvements (done in develop) --> now standalone_linker_wrapper
(this branch had originally a small improvement on top of linker_wrapper_new, but then we ran into merging issues with both Jason and myself being shown as author, preventing either of us from merging it. So we try to use this new branch, which should have all from linker_wrapper_new, and the small improvements).
remove_fparser_concatenation (done in develop) --> for main merged into standalone_update_to_fparser_0.2 DONE
unify_display_of_compiler_wrapper (done in develop) DONE
fix_contained_subroutines (done in develop) DONE
small_bugfixes_ifx_worspace_getter (done in develop)
Fix ifx version, and supports a project_workspace getter
compiler_profiles (done on develop)
MatthewHambley:SubprocessFixture](https://github.com/MatthewHambley/fab/tree/SubprocessFixture
Support compiler with path (and compilers that are not in
$PATH
).fix_two_phase_compilation_errors
Beta Was this translation helpful? Give feedback.
All reactions