mirror of
https://github.com/imputnet/helium.git
synced 2026-11-17 18:59:24 +00:00
when rebasing patches, we often have mostly trivial merge conflicts which look like this: ``` --- a/chrome/browser/extensions/api/settings_private/prefs_util.cc +++ b/chrome/browser/extensions/api/settings_private/prefs_util.cc <<<<<<< ours @@ -616,6 +616,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil ======= @@ -590,6 +590,8 @@ const PrefsUtil::TypedPrefMap& PrefsUtil >>>>>>> theirs ``` this script takes those and resolves them automatically example: ``` $ python3 devutils/resolve_patch_conflicts.py patches/helium/settings/add-search-engine-button.patch: resolved patches/helium/settings/custom-keyboard-shortcuts-page.patch: resolved patches/helium/settings/custom-profile-avatar-ui.patch: resolved patches/helium/settings/fix-text-on-cookies-page.patch: resolved patches/helium/settings/helium-noise-settings.patch: resolved ``` |
History
|
|
|---|---|---|
| .. | ||
| tests | ||
| third_party | ||
| .coveragerc | ||
| __init__.py | ||
| _lint_tests.py | ||
| check_all_code.sh | ||
| check_downloads_ini.py | ||
| check_files_exist.py | ||
| check_gn_flags.py | ||
| check_patch_files.py | ||
| clear-ublock-assets.js | ||
| i18n.py | ||
| i18n_clean.py | ||
| i18n_forage.py | ||
| i18n_generate.py | ||
| i18n_lint.py | ||
| i18n_translate.py | ||
| lint.py | ||
| print_tag_version.sh | ||
| pytest.ini | ||
| README.md | ||
| resolve_patch_conflicts.py | ||
| run_devutils_pylint.py | ||
| run_devutils_tests.sh | ||
| run_devutils_yapf.sh | ||
| run_other_pylint.py | ||
| run_other_yapf.sh | ||
| run_utils_pylint.py | ||
| run_utils_tests.sh | ||
| run_utils_yapf.sh | ||
| set_quilt_vars.fish | ||
| set_quilt_vars.sh | ||
| update_lists.py | ||
| update_platform_patches.py | ||
| validate_config.py | ||
| validate_patches.py | ||
Developer utilities for ungoogled-chromium
This is a collection of scripts written for developing on ungoogled-chromium. See the descriptions at the top of each script for more information.