atlas_git_merge: add --all option to disable ignore list

Add the --all option to not use the standard ignore list in merges. This can be useful when e.g. updates to the externals should be swept forward.

cc @atlas-release-coordinators

changed title from atlas_git_merge: add option to ignore ignore list to atlas_git_merge: add --alll option to disable ignore list

changed title from atlas_git_merge: add --alll option to disable ignore list to atlas_git_merge: add --all option to disable ignore list

This merge request affects 1 package:

• Build

This merge request affects 1 file:

• Build/AtlasBuildScripts/atlas_git_merge.sh

Adding @akraszna as watcher

added Build main review-pending-level-1 labels

CI Result SUCCESS (hash b5bdb5c0)

	Athena	AthSimulation	AthGeneration	AnalysisBase	AthAnalysis	DetCommon
externals
cmake
make
tests

Full details available on this CI monitor view. Check the JIRA CI status board for known problems
Athena: number of compilation errors 0, warnings 0
AthSimulation: number of compilation errors 0, warnings 0
AthGeneration: number of compilation errors 0, warnings 0
AnalysisBase: number of compilation errors 0, warnings 0
AthAnalysis: number of compilation errors 0, warnings 0
DetCommon: number of compilation errors 0, warnings 0
For experts only: Jenkins output [CI-MERGE-REQUEST-EL9 8674] (remote access info)

The change is functional good from my side. Review approved from L1.

added review-approved label and removed review-pending-level-1 label

merged

mentioned in commit 684febc4