Git 新空分支的工作流程

Question

I have a master branch with a Vue project. Now I decided to use Quasar as a CSS Framework and therefore I need a new setup/project. I want to use the same Git Repo so my Question is if there is a best practice workflow for something like this? So actually I need a new empty branch which should be later on the new master as soon as the Quasar Project is at the same level as the master.

Answer 1

I'm assuming that your main branch is master . If not, change the commands below to the correct branch name.

Create a new work branch:

git checkout -b quasar master

Then, modify your code (adding commits etc) and once it works, merge it back:

git checkout master
git merge quasar

If you don't change master while developing on quasar , this should work without problems. Otherwise, you might have to resolve conflicts if you modify some code in different ways on the two branches.