Our workflow goes something like this (it's similar to git-flow):
- Create a branch off master for what we're working on (e.g. case-12345 or blah-123).
- We makes commits and push these branches to the central repository (so that others can easily fetch them).
- Then we want to do a code review based on the commits that are pushed.
At the moment "arc diff" has some strange semantics (that are often more suited to centralized VCS and not DVCS, even when git-branch workflow is used):
- Working directory changes are included.
- It creates a commit that is a copy of the last commit. I'm guessing this is because we're doing "git stash" / "git stash pop" to work around the working directory issues.
- When we push the branch to Phabricator, it considers that to be approval of the commit, even though they are not merged onto master. In our workflow, we only consider them to be approved when they're actually merged into something (such as master), not just pushed to the server.
Is there any similar existing workflow that can be done, or is there a way we can integrate this workflow into Phabricator?