当我执行git status时,我看到一些文件具有本地更改(似乎是缩进更改)。
当我执行git stash时,它不会从队列中删除这些文件。它阻止我的自动拉脚本从远程git获取。
$ git stash
Saved working directory and index state WIP on develop: 05c60a5 Merge remote-tracking branch 'origin/develop' into develop
HEAD is now at 05c60a5 Merge remote-tracking branch 'origin/deve
我编写了一个shell脚本实用程序,用于删除所有合并的本地分支。
#!/usr/bin/env bash
# Remove references to remote branches that no longer exist.
git remote prune origin
# Create a file containing list of all merged branches.
git branch --merged > 5db3bb3c-718a-444c-b1ce-d90a5a0d1cb3.clc
nano 5db3bb3c-718a-444c-b1ce-d90a5a0d1
我在Jenkins做了一个git克隆。
然后在我的脚本中,我运行以下命令:
git pull --recurse-submodules
它从子模块中提取。
不幸的是,我得到了错误:
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details
git pull <remote> <branch>
我怎么才能让詹金斯从师父那里拔出头来呢?我想确保mast