1. Prepare data, submit one row at a time
2. The cashback version 2 has bugs that need to be modified
3. Fix the bug and submit it.
At this point, if you accidentally switch to another branch (for example, checkout master
) git reflog
, you can use it , find the deteched commit, and checkout
pass it for reference .
4. Create a new branch, to preserve the submission (not recommended git reflog
too much trouble)
1) creating a branch in the detached point
At this point, the fixbug has been saved, and this version can be released at this time
5. Merge the fixbug version with our newly developed version
1)
switch back to the master branch 2) master merge fixbug
2) handle conflicts
3) handle the results.
At this time, the new version can be released, and the new version also includes the version that fixes the bug.