Skip to content

Commit 36954c5

Browse files
committed
Added more exceptions to downstream merge.
1 parent f065039 commit 36954c5

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/PostSharp.Engineering.BuildTools/Tools/Git/DownstreamMerge.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,9 @@ void AddFileToKeepOwn( string path )
427427

428428
AddFileToKeepOwn( context.Product.MainVersionFilePath );
429429
AddFileToKeepOwn( context.Product.AutoUpdatedVersionsFilePath );
430+
AddFileToKeepOwn( "Build.ps1" );
431+
AddFileToKeepOwn( "DockerBuild.ps1" );
432+
AddFileToKeepOwn( "Directory.Packages.props" );
430433

431434
Directory.EnumerateFiles( Path.Combine( context.RepoDirectory, ".teamcity" ), "*", SearchOption.AllDirectories )
432435
.Select( p => Path.GetRelativePath( context.RepoDirectory, p ) )

0 commit comments

Comments
 (0)