We are setting up our sprint boards to track development/QA tasks only. Board flow in general is To Do -> In Progress -> Done. The workflow statuses are grouped under each of these fields. When a developer's work is complete, it moves to a status of "Ready to Schedule Deployment", where it is picked up by the deployment team to do their magic. This includes deploying the change and monitoring the change for a specific amount of time. WHEN they deploy is up to them most of the time, so the timeframe is unknown for planning. After Monitoring, it moves to Needs Code Merge, where the developer will need to pick it up one final time, merge the branch and mark it as complete.
We are experimenting with all of the Deployment tasks as being marked as Done, since the developer is complete with the task and can get credit for completion during the sprint. However, when the development team changes the status to Needs Code Merge, it will reappear on the Backlog and can be pulled into a sprint to do the final steps before closing the task for good.
So, my question is how does this affect reporting such as velocity? When it comes back into To Do, are the issue counts (we are not yet to Story Points) removed from the previous Sprint and added to the current sprint, or are they counted twice?