Prevent merge conflicts test from failing due to a rebase warning/error

[junpataleta]

No description provided.

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 33.05%. Comparing base (9d014b0) to head (08044e0).

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #311      +/-   ##
==========================================
+ Coverage   25.94%   33.05%   +7.10%     
==========================================
  Files          71       71              
  Lines        3222     3222              
==========================================
+ Hits          836     1065     +229     
+ Misses       2386     2157     -229     

Flag	Coverage Δ
check_upgrade_savepoints	0.46% <ø> (ø)
checkstyle_manipulations	0.00% <ø> (ø)
compare_databases	2.38% <ø> (ø)
continuous_manage_queues_validation	0.71% <ø> (ø)
define_excluded	1.11% <ø> (ø)
detect_conflicts	1.48% <ø> (ø)
diff_extract_changes	0.00% <ø> (ø)
git_sync_two_branches	2.04% <ø> (ø)
grunt_process	3.01% <ø> (ø)
illegal_whitespace	2.63% <ø> (ø)
list_valid_components	0.00% <ø> (ø)
mustache_lint	2.82% <ø> (ø)
mustache_lint_plugins	1.30% <ø> (ø)
php_lint	1.21% <ø> (ø)
prepare_npm_stuff	1.52% <ø> (ø)
remote_branch_checker	17.44% <ø> (?)
remote_branch_reporter	0.00% <ø> (ø)
setup	0.00% <ø> (ø)
thirdparty_check	1.45% <ø> (ø)
travis-branch-checker	0.00% <ø> (ø)
upgrade_external_backup	1.61% <ø> (ø)
verifications	0.00% <ø> (ø)
verify_commit_messages	2.63% <ø> (ø)
verify_phpunit_xml	1.24% <ø> (ø)
versions_check_set	5.02% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[HuongNV13]

Thanks, Jun for working on this one.
It looks good to me, and the tests are passed!