Searched refs:merge (Results 1 – 25 of 39) sorted by relevance
12
| /Zephyr-latest/ |
| D | .gitlint | 7 # By default gitlint will ignore merge commits. Set to 'false' to disable.
8 ignore-merge-commits=false
52 # Whether to ignore this rule on merge commits (which typically only have a title)
54 ignore-merge-commits=false
|
| /Zephyr-latest/boards/common/ |
| D | nios2.board.cmake | 7 # TODO: merge this script into nios2.py
|
| /Zephyr-latest/doc/services/device_mgmt/ |
| D | mcumgr_backporting.rst | 84 #. Create the pull request selecting ``v2.7-branch`` as the merge target.
95 1. Create the pull request selecting ``v2.7-branch`` as the merge target.
108 As a maintainer, these are the steps required before proceeding with the merge process:
128 To merge a backported fix after the pull request for the fix has gone through the review process,
147 #. Push the reviewed pull-request branch to the newly created branch and merge the backport branch
159 As an MCUmgr maintainer, you may not be able to merge the ``west.yml`` update, to introduce the fix…
160 However, you are responsible for such a merge to happen as soon as possible after the MCUmgr fixes …
|
| /Zephyr-latest/subsys/testsuite/coverage/ |
| D | coverage.h | 116 void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); member
|
| D | coverage.c | 111 if (!info->merge[iter_1]) { in gcov_calculate_buff_size()
201 if (!info->merge[iter_counts]) { in gcov_populate_buffer()
|
| /Zephyr-latest/scripts/build/ |
| D | mergehex.py | 28 ih.merge(to_merge, overlap=overlap)
|
| /Zephyr-latest/tests/kernel/device/ |
| D | CMakeLists.txt | 14 # at all. So add this flag to merge string constants such that
|
| /Zephyr-latest/subsys/net/lib/lwm2m/ |
| D | README_lwm2m | 24 If the patch fails to apply, you can attempt to use the 3-way merge capabilities by committing the …
|
| /Zephyr-latest/doc/_doxygen/ |
| D | doxygen-awesome-sidebar-only-darkmode-toggle.css | 14 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
| D | doxygen-awesome-sidebar-only.css | 13 to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
| /Zephyr-latest/doc/project/ |
| D | project_roles.rst | 107 approvals needed to merge a PR. Other criteria for merging may apply.
141 required approvals needed to merge a PR. Other criteria for merging may apply.
215 * Right to merge code changes to the zephyr tree following the project rules.
220 * Responsibility to merge all contributions regardless of their
222 maintainers and follow the merge criteria of a change.
362 approvals, the merge criteria is extended with the guidelines below:
378 * Release engineers shall not merge code changes originating and reviewed
379 only by their own organisation. To be able to merge such changes, at least
|
| D | dev_env_and_tools.rst | 26 release managers are allowed to merge a pull request into the main branch once
31 Give reviewers time to review before code merge
161 approvals are required to be able to merge a pull request. The person merging
162 the request can merge without approving or approve and merge to get to the 2
351 PR complexity, affects how long a merge should be held to ensure proper
|
| D | release_process.rst | 68 will be called 3.1.0-rc1. The -rc1 release is the signal that the time to merge
|
| /Zephyr-latest/cmake/compiler/clang/ |
| D | compiler_flags.cmake | 127 set_compiler_property(PROPERTY no_global_merge "-mno-global-merge")
|
| /Zephyr-latest/scripts/west_commands/runners/ |
| D | nrf_common.py | 456 net_hex.merge(self.hex_contents[start:end])
458 app_hex.merge(self.hex_contents[start:end])
|
| /Zephyr-latest/doc/contribute/ |
| D | contributor_expectations.rst | 17 - Easier to rebase and merge. Smaller PRs are less likely to conflict with other
103 - PRs must pass all CI checks. This is a requirement to merge the PR.
149 Zephyr project does not require all comments to be resolved before merge.
|
| D | guidelines.rst | 897 merge conflict. If so, rebase your local branch::
928 attention needed and it will be ready for merge sooner than later:
936 #. On the PR page, check if the change can still be merged with no merge
|
| /Zephyr-latest/include/zephyr/arch/nios2/ |
| D | linker.ld | 217 * address, and one to merge them - but if we can put the most commonly
|
| /Zephyr-latest/doc/develop/ |
| D | modules.rst | 125 *Rebase and merge*, or *Create a merge commit* option using Github UI). This
148 the *Rebase & merge* operation. This approach is simple and
162 Upstream changes brought in by performing a Git merge of the intended upstream
165 the *Create a merge commit* operation.
169 downside of this approach is that two additional merge commits are generated in
217 responsibility to merge approved pull requests in the main branch of a
|
| /Zephyr-latest/doc/build/dts/ |
| D | bindings-syntax.rst | 692 merge. The build system will check that the resulting merged binding is
728 This relies on the dictionary merge to fill in the other keys for ``reg``, like
|
| /Zephyr-latest/doc/develop/west/ |
| D | workspaces.rst | 27 rebase it on top of a new ``manifest-rev``, or merge ``manifest-rev`` into
|
| D | built-in.rst | 173 - in all other projects where no rebase or merge is needed it keeps
|
| /Zephyr-latest/doc/services/tfm/ |
| D | overview.rst | 267 sign the secure and non-secure images, and merge the three binaries into a
|
| /Zephyr-latest/doc/build/cmake/ |
| D | index.rst | 84 C++). The C preprocessor is also used to merge in any devicetree
|
| /Zephyr-latest/doc/safety/ |
| D | safety_overview.rst | 273 a path to merge these changes back into the main branch so that they are not lost, and to have
|
12
