git checkout/merge branch

最新推荐文章于 2025-01-01 05:00:00 发布

原创最新推荐文章于 2025-01-01 05:00:00 发布 · 230 阅读

0 ·

CC 4.0 BY-SA版权

文章标签：

#git

本文详细介绍了使用Git进行版本控制的基本操作步骤，包括从主分支拉取最新代码、创建新分支、重新基底、提交更改、合并分支到主分支及推送更改等。此外还涉及如何将特定文件从一个分支复制到另一个分支的具体操作。

//pull the latest code from master branch
git pull
// crate a new branch from master
git checkout -b new_branch
//rebase
git pull original master new_branch --rebase
//commit
git commit --date="$(date -R)" --amend
//merger new_branch to master

switch to master branch
git checkout master
pull the latest code on master branch
git pull
merge new_branch to master
git merge new_branch master
push the change to master
git push
if want to copy specific file from new_branch to master.
checkout to master
git checkout master
copy the specific file from new_branch to master
git checkout new_branch <file_papth>