Small knowledge, big challenge! This article is participating in the creation activity of “Essential Tips for Programmers”.

1. The background

We have two branches, dev for test services and FEAT for current requirements development. Normally, we would work on the feat branch, and then we would merge the feat branch into dev as soon as we got there, and that’s what we do every day.

Here’s the problem. One of the stupid things I often do is when I merge my feat branch into my dev branch and stay on my Dev branch, I often forget to switch back to my feat branch and start developing on my Dev branch, write a bunch of code, and then happily add and commit

git add .
git commit -m "Feat: Complete the XXX function"
Copy the code

When you’re ready to push to the far end, Dev dev dev dev dev dev dev dev dev dev dev dev dev dev Dev Dev Now that you’re done, you still have to make sure that the code doesn’t get deleted and you successfully cut to the feat branch.

2. Solutions

Comb through the current situation:

  1. A bunch of code is written on the dev branch
  2. Add and commit on the dev branch

Desired purpose:

  1. Don’t use this stack of code on the dev branch
  2. Move the stack of code written on the Dev branch to feat
  3. Once you have successfully moved to the FEAT branch, add, Commit, and push

Solution steps:

  1. Dev branchesRetracement commitWithout rollback add., runresetThe command
/ / dev branch
git reset --soft HEAD^
Copy the code
  1. We can’t cut to the feat branch at this point, we need this stack of codestorageGet up to cut to the feat branch and executestashCommand:
/ / dev branch
git stash
Copy the code
  1. With stash, the dev branch workspace no longer has this pile of code, so it canCut to the feat branch, the implementation ofcheckoutCommand:
/ / dev branch
git checkout feat
Copy the code
  1. At this point, I’m on the feat branchThe stored code is releasedGo to the feat branch and executestash popCommand:
/ / feat branch
git stash pop
Copy the code
  1. Commit = commit = commit = commit = commit = commit = commit = commit = commit
/ / feat branch
git commit -m "Feat: Complete the XXX function"
git push origin feat
Copy the code

Here it is: successfully resolved.

Original article, hope to help you, but also for the community to contribute their own strength! Please give a thumbs up if you like

Akiko: A little dream in the front

Home page: To learn more, click on your home page