Permalink
Browse files

warning for ex post facto case with --git

  • Loading branch information...
1 parent b7e9c9d commit 73b6fdf9e6f936059d8ae3dc38c5515af29e5aa2 @jaked committed May 10, 2011
Showing with 16 additions and 0 deletions.
  1. +16 −0 bin/scala-bootstrapper
View
16 bin/scala-bootstrapper
@@ -134,3 +134,19 @@ if git
system("git commit -m'merged scala-bootstrapper'") # fails if no change
end
+
+if $ex_post_facto
+ puts <<EOF
+Found existing .git directory; scala-bootstrapper branch created but
+generated files not merged to #{$branch}. To manually merge changes,
+run
+
+ git cherry-pick --no-commit scala-bootstrapper
+
+then
+
+ git commit
+
+once you have resolved any conflicts.
+EOF
+end

0 comments on commit 73b6fdf

Please sign in to comment.