Do you really understand code rollback?

 

What is code rollback ?

Before I officially start today's sharing , First, I'll tell you two core concepts :

1. Package rollback refers to , Online systems , Rollback from the current version to the previous stable version .

2. Code rollback refers to ,Git The pointer to the branch ( The cursor ), Change from pointing to the current problematic version to pointing to a problem free version on the branch history tree , And this version can be what it used to be commit, It can also be new commit.

Are you also having problems ?

In daily code management , Most development engineers are troubled , The question they ask me most is : The problem of code rollback . These problems , Some only affect personal development , And some involve the whole team . I have sorted and summarized these problems , You can see if you have encountered similar problems ?

1. This morning, I pulled a new branch in my own development environment , submitted 5 individual commit, Latest submitted 3 individual commit I don't want it anymore , Then how can I return here 3 individual commit The previous one commit?

answer : Reference I will share below “ Personal branch rollback ” The content of .

2. My local branch passes reset --hard Code rollback , Want to pass push Let the remote branches roll back together , perform push An error is reported when ordering , What should I do ?

answer : If not -f Parameters , perform reset --hard after ,push Will be rejected , Because the latest submission of your current branch lags behind its corresponding remote branch .push When combined with -f Parameters represent forced overrides .

3. The online package has been rolled back to yesterday's version , I clearly remember yesterday I put