version control - Get changes from master into branch in Git

Question

asked Oct 17, 2021 in Technique[技术] by 深蓝 (71.8m points)

In my repository I have a branch called aq which I'm working on.

I then committed new work and bugs in master.

What is the best way to get those commits into the aq branch? Create another new branch out of master and merge it with aq?

See Question&Answers more detail:os

与恶龙缠斗过久,自身亦成为恶龙；凝视深渊过久,深渊将回以凝视…

881 views

1 Answer

深蓝 · Answer 1 · 2021-10-16T23:50:09+0000

answered Oct 17, 2021 by 深蓝 (71.8m points)

Check out the aq branch, and rebase from master.

git checkout aq
git rebase master

与恶龙缠斗过久,自身亦成为恶龙；凝视深渊过久,深渊将回以凝视…