git merge 测试

从master拉出分支dev，master和dev操作同一个类，然后合并分支，测试是否有代码丢失情况

总结论：合并分支dev到master，dev修改、删除时必定会冲突，因为涉及更改了master原有数据；dev添加时，需要看添加数据位置，改变master顺序时也会冲突

master添加，dev添加，冲突

结论：master和dev都新增代码，合并分支dev到master会冲突，解决冲突后，合并到dev将是解决冲突后的代码

master 添加后 master = 0;

private int master = 0;

dev 添加后 dev = 1;

private int dev = 1;

git merge dev 合并到master,出现冲突

<<<<<<< HEAD
    private int master = 0;
=======
    private int dev = 1;
>>>>>>> dev

解决冲突

private int master = 0;
private int dev = 1;

git merge master 合并到dev

private int master = 0;
private int dev = 1;

master添加，dev不变

结论： master新增代码，dev不变，合并分支dev到master，保持master的最新代码

master 添加 master2 = 2后

private int master = 0;
private int dev = 1;
private int master2 = 2;

dev 不变

private int master = 0;
private int dev = 1;

git merge dev 合并到master

private int master = 0;
private int dev = 1;
private int master2 = 2;

master添加，dev删除，冲突

结论：master新增代码，dev删除代码，合并分支dev到master会冲突，解决冲突后，合并到dev将是解决冲突后的代码

master 添加 master2 = 2后

private int master = 0;
private int dev = 1;
private int master2 = 2;

dev 删除 dev = 1 后

private int master = 0;

git merge dev 合并到master,出现冲突

    private int master = 0;
<<<<<<< HEAD
    private int dev = 1;
    private int master2 = 2;
=======
>>>>>>> dev

解决冲突

private int master = 0;
private int master2 = 2;

git merge master 合并到dev

private int master = 0;
private int master2 = 2;

master修改，dev添加，冲突

结论：master修改代码，dev新增代码，合并分支dev到master会冲突，解决冲突后，合并到dev将是解决冲突后的代码

master 修改 master = 4 后

private int master = 4;
private int master2 = 2;

dev 添加 dev = 0 后

private int master = 0;
private int dev = 0;
private int master2 = 2;

git merge dev 合并到master,出现冲突

<<<<<<< HEAD
    private int master = 4;
=======
    private int master = 0;
    private int dev = 0;
>>>>>>> dev
    private int master2 = 2;

解决冲突

private int master = 4;
private int dev = 0;
private int master2 = 2;

git merge master 合并到dev

private int master = 4;
private int dev = 0;
private int master2 = 2;

master修改，dev修改，冲突

结论：master修改代码，dev修改代码，合并分支dev到master会冲突，解决冲突后，合并到dev将是解决冲突后的代码

master 修改 dev = 4 后

private int master = 4;
private int dev = 4;
private int master2 = 2;

dev 添加 dev = 3 后

private int master = 4;
private int dev = 3;
private int master2 = 2;

git merge dev 合并到master,出现冲突

    private int master = 4;
<<<<<<< HEAD
    private int dev = 4;
=======
    private int dev = 3;
>>>>>>> dev
    private int master2 = 2;

解决冲突

private int master = 4;
private int dev = 4;
private int master2 = 2;

git merge master 合并到dev

private int master = 4;
private int dev = 4;
private int master2 = 2;

master删除，dev添加

结论： master删除代码，dev新增代码，合并分支dev到master，保持master的最新代码

master 删除 dev = 4 后

private int master = 4;
private int master2 = 2;

dev 添加 dev3 = 3 后

private int master = 4;
private int dev = 4;
private int master2 = 2;
private int dev3 = 3;

git merge dev 合并到master

private int master = 4;
private int master2 = 2;
private int dev3 = 3;