       amsf__theme__update_remote:
         options:
           cwd: "<%= amsf.base %>/themes/<%= amsf.theme.current %>/"
+
+    gitcheckout:
+      amsf__core__checkout_branch:
+        options:
+          cwd: "<%= gitpull.amsf__core__update_remote.options.cwd %>"
+          branch: "<%= amsf.branch %>"
+
+      amsf__theme__checkout_branch:
+        options:
+          cwd: "<%= gitpull.amsf__theme__update_remote.options.cwd %>"
+          branch: "<%= amsf.theme.branch %>"
 
     gitclean:
       options:


    amsf:
      base: "_amsf"
      core: "<%= amsf.base %>/core"
      user:
        assets: "<%= config.app %>/assets"
      theme:
        assets: "<%= amsf.user.assets %>/themes/<%= amsf.theme.current %>"
        current: "<%= config.amsf.theme %>"
        new_name: grunt.option("theme") or "<%= amsf.theme.current %>"

        "gitreset:amsf__core__reset_git"
        "gitclean:amsf__core__clean_git"
        "gitpull:amsf__core__update_remote"
        "gitcheckout:amsf__core__checkout_branch"
      ]
    else
      grunt.task.run [
