【EFCORE笔记】团队环境中的迁移

在团队环境中的迁移

Git 工作流程

来自<http://www.ruanyifeng.com/blog/2015/12/git-workflow.html>

 

Git远程操作详解

来自<http://www.ruanyifeng.com/blog/2014/06/git_remote.html>

 

共存合并

<<<<<<< Mine b.Property<bool>("Deactivated");
=======
b.Property<int>("LoyaltyPoints");
>>>>>>> Theirs

b.Property<bool>("Deactivated"); b.Property<int>("LoyaltyPoints");

解决冲突

<<<<<<< Mine b.Property<string>("Username");
=======
b.Property<string>("Alias");
>>>>>>> Theirs