When a requirement of new feature or bugfix is coming

1. Create branch from develop branch.
2. Happy coding;), daily commit, merge from develop and resolve conflicts.
3. If completed, create a pull request for other developers to review.
4. Waiting for others' approve and merge actions.
5. Done or keep improving.

I worked half a day, and turns out I'm not working on the right branch. :(

Don't be upset, all you need to do is to convert uncommited changes into a patch file.

1. Stage modifications.
2. Create a patch for staged files, save it anywhere you can locate.
3. Extract the patch to your own branch.