同时合并两个分支.我的文件丢失了 [英] while merging two branches. My files are getting lost

问题描述

我有两个分支名称为master和develop.这两个分支都包含一些文件. 当我将开发合并到母版时，我的文件之一被删除了. 我不明白当我没有放置任何删除命令时，它是如何被删除的. 我正在使用git版本:1.9.5.msysgit.1和Windows 8.

I am having two branches names as master and develop. Both branches consist of some files in it. When I merged develop to master, one of my file got deleted. I don't understand how it got deleted when I didn't put any delete command. I am using git version: 1.9.5.msysgit.1 and Windows 8.

推荐答案

当分支develop分支后删除此文件时，将develop合并到您的行中(例如合并到master)在那里也有这种效果.

When the branch develop removed this file after it branched off, then a merge of develop into your line (e.g. into master) would introduce this effect there as well.

这篇关于同时合并两个分支.我的文件丢失了的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！