helium/devutils
jj 0a5feb3129
devutils: add script to resolve trivial patch merge conflicts (#2869)
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 2026-11-09 09:03:37 +01:00
..
tests merge: update to ungoogled-chromium 138.0.7204.100 2025-07-10 22:20:03 +06:00
third_party Replace scheme relative URLs with https URLs (#2171) 2022-12-26 14:46:34 +03:00
.coveragerc Add patch duplication test 2020-03-07 12:08:21 -08:00
__init__.py Add patch duplication test 2020-03-07 12:08:21 -08:00
_lint_tests.py devutils/lint_tests: add DEPS to license header ignores 2026-01-17 01:36:06 +06:00
check_all_code.sh devutils: use portable bash shebangs (#2318) 2026-08-14 16:34:56 +02:00
check_downloads_ini.py merge: update ungoogled-chromium to 153.0.8010.52 2026-09-18 02:15:08 +06:00
check_files_exist.py merge: update to ungoogled-chromium 138.0.7204.100 2025-07-10 22:20:03 +06:00
check_gn_flags.py merge: update to ungoogled-chromium 138.0.7204.100 2025-07-10 22:20:03 +06:00
check_patch_files.py merge: update ungoogled-chromium to 149.0.7827.196 2026-06-24 03:42:38 +06:00
clear-ublock-assets.js patches/ublock: install ublock as component extension 2025-09-22 15:21:13 +00:00
i18n.py devutils/i18n: add forage command (#1944) 2026-06-15 16:00:14 +02:00
i18n_clean.py devutils/i18n: add clean command (#1869) 2026-06-05 19:23:15 +02:00
i18n_forage.py devutils/i18n: add forage command (#1944) 2026-06-15 16:00:14 +02:00
i18n_generate.py i18n: fix newline parsing for onboarding 2026-06-17 16:28:03 +00:00
i18n_lint.py i18n: validate placeholders during linting, fix broken message (#2235) 2026-07-30 20:18:11 +00:00
i18n_translate.py devutils/i18n: add an option to translate using local CLI tools (#1942) 2026-06-14 13:01:01 +00:00
lint.py devutils/lint: fix pylint errors 2025-07-28 11:45:31 +00:00
print_tag_version.sh Add devutils/print_tag_version.sh 2019-03-25 11:37:18 -07:00
pytest.ini devutils/validate_patches.py: Add --dry-run to verbose error 2020-03-07 20:39:37 -08:00
README.md Rearrange files and folders 2018-05-11 16:20:32 +08:00
resolve_patch_conflicts.py devutils: add script to resolve trivial patch merge conflicts (#2869) 2026-11-09 09:03:37 +01:00
run_devutils_pylint.py merge: update to ungoogled-chromium 138.0.7204.100 2025-07-10 22:20:03 +06:00
run_devutils_tests.sh devutils: use portable bash shebangs (#2318) 2026-08-14 16:34:56 +02:00
run_devutils_yapf.sh devutils: use portable bash shebangs (#2318) 2026-08-14 16:34:56 +02:00
run_other_pylint.py merge: update to ungoogled-chromium 138.0.7204.100 2025-07-10 22:20:03 +06:00
run_other_yapf.sh devutils: use portable bash shebangs (#2318) 2026-08-14 16:34:56 +02:00
run_utils_pylint.py merge: update to ungoogled-chromium 138.0.7204.100 2025-07-10 22:20:03 +06:00
run_utils_tests.sh devutils: use portable bash shebangs (#2318) 2026-08-14 16:34:56 +02:00
run_utils_yapf.sh devutils: use portable bash shebangs (#2318) 2026-08-14 16:34:56 +02:00
set_quilt_vars.fish devutils/set_quilt_vars: make push and pop quiet by default (#2867) 2026-11-04 23:17:27 +01:00
set_quilt_vars.sh devutils/set_quilt_vars: make push and pop quiet by default (#2867) 2026-11-04 23:17:27 +01:00
update_lists.py utils: update contingent paths, prune files too 2026-10-27 22:55:46 +00:00
update_platform_patches.py devutils/platform_patches: preserve generic series changes on unmerge (#1550) 2026-05-02 10:50:40 +02:00
validate_config.py repo: add ungoogled-chromium license to root 2025-05-31 11:51:48 +00:00
validate_patches.py merge: update ungoogled-chromium to 149.0.7827.196 2026-06-24 03:42:38 +06:00

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.