Skip to content

Commit 7e306e1

Browse files
committed
Combine RepoConfig with the one taken the higher importance on the right side.
This is done in the `RepoConfigLoader` with the default config and the supplied additional configs. And now here in the same way. The `RepoConfig.combine` function treats the 2nd argument as the one overwriting the 1st one in cas emerging doesn't make sense. This applies at the moment only for "pin".
1 parent 60f1864 commit 7e306e1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

modules/core/src/main/scala/org/scalasteward/core/repoconfig/RepoConfigAlg.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ final class RepoConfigAlg[F[_]](maybeGlobalRepoConfig: Option[RepoConfig])(impli
3232
F: MonadThrow[F]
3333
) {
3434
def mergeWithGlobal(maybeRepoConfig: Option[RepoConfig]): RepoConfig =
35-
(maybeRepoConfig |+| maybeGlobalRepoConfig).getOrElse(RepoConfig.empty)
35+
(maybeGlobalRepoConfig |+| maybeRepoConfig).getOrElse(RepoConfig.empty)
3636

3737
def readRepoConfig(repo: Repo): F[ConfigParsingResult] =
3838
for {

0 commit comments

Comments
 (0)