git办公操作小记

• 删除旧的分支： git push origin --delete old-branch-name

• 修改分支名为新的分支名：git push origin -u feature/20240724/branch1

• 从远程分支拉一个本地分支
  git fetch origin
  git checkout -b “feature/20240724/branch1” “origin/feature/20240724/branch1”

-解决流水线冲突
思路就是从流水线拉一个分支到本地，然后把自己的分支合到该分支，再重新push上去
git fetch origin
git checkout “release/sit”
git merge --no-ff “feature/20240724/branch1”

git push origin “release/sit”