From 21bf524c074573bb88c5e6809139721ee5ad45dc Mon Sep 17 00:00:00 2001 From: Leon Wright Date: Wed, 13 Jul 2016 18:50:15 +0800 Subject: [PATCH] Add comment with why this workflow was chosen --- lib/App/KSP_CKAN/Tools/Git.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/App/KSP_CKAN/Tools/Git.pm b/lib/App/KSP_CKAN/Tools/Git.pm index 869ad0b..1c238d8 100644 --- a/lib/App/KSP_CKAN/Tools/Git.pm +++ b/lib/App/KSP_CKAN/Tools/Git.pm @@ -288,6 +288,11 @@ branch and cherry-picks the commit from the previous commit to staging. # seeing how this works in practice and think on how to solve # them drifting. +# NOTE: We're using a cherry-pick workflow because we always generate files +# in master. This is so we can have as little impact on the primary +# workflow as possible. Staged commits are a seperate workflow that +# only get triggered for netkans that require it. + method staged_commit(:$identifier, :$file, :$message = "Generic Commit") { # Need to push our changes before checking out staging otherwise our # staged commits end up with the commits already in master.