I've been working on a forked branch "forkedBranch
" and made many updates to my app. When I was happy with the updates, I went back to my master
branch (git checkout master
) and merged my forkedBranch
(git merge forkedBranch
). Unfortunately, the master
branch has lots of problems with it that weren't present in forkedBranch
.
The app is too complicated for me to want to go through and find all the bugs. Is there a way to make my master
branch identical to forkedBranch
to save me the hassle?
与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…