我正在尝试添加类似于此问题中的自定义合并策略:Git合并冲突始终采用最新文件
我已将脚本保存为git-merge-latest.sh,并将以下行添加到.git/config:
[merge "latest"]
name = select latest file merge driver
driver = git-merge-latest.sh %O %A %B
但是,当我跑步时git pull --strategy latest,我收到消息:
Could not find merge strategy 'latest'.
Available strategies are: octopus ours recursive resolve subtree.
我试过检查git config merge.latest.driver,它返回预期的输出.我也改变的值driver来true只是为了验证它是不是找到脚本的问题.
这发生在运行git 1.8.2.2和1.7.9.5的两个不同系统上.我究竟做错了什么？
试图构建这个Dockerfile:
FROM dockerfile/ubuntu
RUN apt-get update && apt-get install -y apache2
COPY proxypass.conf /etc/apache2/sites-available
COPY caching.conf /etc/apache2/conf-available
RUN a2ensite proxypass \
&& a2enconf caching \
&& a2disconf serve-cgi-bin
EXPOSE 80
CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
在proxypass.conf和caching.conf文件都位于apache与沿目录Dockerfile.
Running docker build给出了这个输出:
$ sudo docker build -t me/apache apache
Sending build context to Docker daemon 29.7 kB
Sending build context to Docker daemon
Step 0 : FROM dockerfile/ubuntu
---> 77f8745ed183
Step 1 : RUN apt-get …