diff --git a/Mackup/.gitconfig b/Mackup/.gitconfig index d83a03b..2d7a2b3 100644 --- a/Mackup/.gitconfig +++ b/Mackup/.gitconfig @@ -95,5 +95,3 @@ autoSquash = true [fetch] prune = true -[git-town] - ship-strategy = api diff --git a/config/.git-branches.toml b/config/.git-branches.toml index 7b82c14..a37b1f7 100644 --- a/config/.git-branches.toml +++ b/config/.git-branches.toml @@ -53,6 +53,8 @@ sync-before-ship = false # and you want to keep it in sync with the repo it was forked from. sync-upstream = true +ship-strategy = "api" + [branches] # The main branch is the branch from which you cut new feature branches,