resolve conflicts

Signed-off-by: Jianjun Liao <[email protected]>
pingcap · Apr 23, 2024 · e9de0ad · e9de0ad
1 parent d1a725a
commit e9de0ad
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 20 deletions.
diff --git a/br/tests/README.md b/br/tests/README.md
@@ -48,21 +48,7 @@ This folder contains all tests which relies on external processes such as TiDB.
     The versions must be ≥2.1.0.
 
     What's more, there must be dynamic link library for TiFlash, see make target `bin` to learn more.
-<<<<<<< HEAD
     You can install most of dependencies by running `download_tools.sh`.
-=======
-    You can install most of dependencies by running following commands:
-
-    ```sh
-    cd ${WORKSPACE}/tidb
-    rm -rf third_bin/
-    rm -rf bin/
-    br/tests/download_integration_test_binaries.sh
-    mkdir -p bin && mv third_bin/* bin/
-    rm -rf third_bin/
-    make failpoint-enable && make && make failpoint-disable #make tidb
-    ```
->>>>>>> d4a80587478 (br: add integration test for ingest corner case test (#52734))
 
 2. The following programs must be installed:
 

diff --git a/br/tests/run_group_br_tests.sh b/br/tests/run_group_br_tests.sh
@@ -23,13 +23,8 @@ groups=(
 	["G00"]="br_300_small_tables br_backup_empty br_backup_version br_cache_table br_case_sensitive br_charset_gbk br_check_new_collocation_enable"
 	["G01"]="br_autoid br_crypter2 br_db br_db_online br_db_online_newkv br_db_skip br_debug_meta br_ebs br_foreign_key br_full"
 	["G02"]="br_full_cluster_restore br_full_ddl br_full_index br_gcs br_history"
-<<<<<<< HEAD
-	["G03"]='br_incompatible_tidb_config br_incremental br_incremental_ddl br_incremental_index br_pitr'
-	["G04"]='br_incremental_only_ddl br_incremental_same_table br_insert_after_restore br_key_locked br_log_test br_move_backup br_mv_index br_other br_partition_add_index'
-=======
 	["G03"]='br_incompatible_tidb_config br_incremental br_incremental_ddl br_incremental_index br_pitr br_pitr_failpoint'
-	["G04"]='br_incremental_only_ddl br_incremental_same_table br_insert_after_restore br_key_locked br_log_test br_move_backup br_mv_index br_other br_partition_add_index br_tidb_placement_policy br_tiflash'
->>>>>>> d4a80587478 (br: add integration test for ingest corner case test (#52734))
+	["G04"]='br_incremental_only_ddl br_incremental_same_table br_insert_after_restore br_key_locked br_log_test br_move_backup br_mv_index br_other br_partition_add_index'
 	["G05"]='br_range br_rawkv br_replica_read br_restore_TDE_enable br_restore_log_task_enable br_s3 br_shuffle_leader br_shuffle_region br_single_table'
 	["G06"]='br_skip_checksum br_small_batch_size br_split_region_fail br_systables br_table_filter br_txn br_stats'
 	["G07"]='br_clustered_index br_crypter br_table_partition br_tidb_placement_policy br_tiflash br_tikv_outage'