分类：Git

Mave/git issue fixed 例子

Posted on by admin
  • 当 maven compile code时, 下载很多的resource files时, 怎样略过如下
mvn clean compile -o install
  • 开发免不了进行代码review，当遇到git提交出现 ‘Changes not staged for commit’ 问题的解决方法
    Cases are
    1) when pull from remote branch1
    2) Modify and submit, then push to remote branch2
    3) Remote branch2 updated some files, and local branch modified
    4) Cant submit and push to remote branch2 now

Solution steps:
1) Check out new local branch from remote branch2
2) Modify new local branch and submit & push to remote branch2
3) After merge to remote branch1(e.g. master branch), remove old local branch and checkout from remote branch
4) Remove the local branch which pushes to remote branch2

开发流程之git命令

Posted on by admin

1. checkout 远端开发branch到本地,

git checkout -b local_dev_branch origin/dev

2. 本地修改代码, 然后提交代码, 例如如下提交java文件.

git commit -m *.java "modified java files"

3. 本地修改后, 提交代码到远端, 远端的branch名可与本地相同，等待review, local_dev_branch_for_remote 就是远端branch名

git push origin local_dev_branch:local_dev_branch_for_remote

4. 当review后需要继续修改，重复步骤 2-3, reviewed通过merge到dev branch后, 可以删除远端branch

git push --delete origin local_dev_branch_for_remote

5.然后删除本地branch

# change to other branch before delete
git checkout other_local_branch
# delete
git branch -D  local_dev_branch

DevOps Git 实践: 创建新的branch并merge到远程branch操作

Posted on by admin

DevOps Git 实践之branch操作

一般应用于开发和测试的操作

例如一个研究小组需要从测试组或开发组获得一个新的branch,而不是master branch,并会创建和merge到任意远程branch里
如下步骤:

# clone 远程 branch

git clone --single-branch -b remote-branch-name https://github.../remote.git

# 检查当前branch

git branch

# 基于远程branch 创建新的branch

git checkout -b new-branch-name remote-branch-name

# 添加code及提交


git add .
git commit -a -m "....."

# push 本地到远程branch

git push origin new-branch-name:remote-branch-name


#或者把自己新的branch push到远程

git push -u origin new-branch-name


# 若多人使用远程branch,需要更新到本地

git pull origin remote-branch-name new-branch-name