We have a master
branch and feature branch called feature/google-analytics
.
The feature branch was created from the master
branch. There are so many hotfixes applied in the master
branch.
But now when I try to rebase with master branch, it shows many conflicts. so I aborted the git rebase.
Instead, apply the hotfixes manually to the feature branch.
Now I want to reset master branch same as feature branch.
How to do that?
为了将一个分支重置为另一个远程分支,您可以简单地使用
git reset --hard origin/feature/google-analytics
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.