Skip to content

Commit

Permalink
Merge branch 'master' of github.com:winton/gitcycle
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
winton committed Feb 20, 2012
2 parents cd523c9 + b3fbfe7 commit ea35bb1
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion README.md
Expand Up @@ -168,4 +168,8 @@ $ gitc st - shortcut
* gitc qa pass 1234 # doesnt update lighthouse and screws up git issue tags
* [issue number] it marks it pending-qa and failed.. not correct. I'll take a look at this over the weekend -Tung
* gitc qa pass # since we're changing this to pass all the tickets, we need to loop through all the merged issues and update the lighthouse state to pending-qa
* When conflict happens on gitc qa pass, label does not get updated on issue
* When conflict happens on gitc qa pass, label does not get updated on issue
* gitc qa resolved is not working, we need gitc qa pass to merge the whole branch into the target branch
* gitc qa clean # to clean up old branches
* gitc qa pass # if ticket resolved, it should stay resolved
* gitc ready # if pull requests already created, it should prompt and explain that a new branch and issue is being created, consider effect of multiple developers

0 comments on commit ea35bb1

Please sign in to comment.