{"action":"reopened","issue":{"url":"https://api.github.com/repos/inexistence/PictureLibrary/issues/7","labels_url":"https://api.github.com/repos/inexistence/PictureLibrary/issues/7/labels{/name}","comments_url":"https://api.github.com/repos/inexistence/PictureLibrary/issues/7/comments","events_url":"https://api.github.com/repos/inexistence/PictureLibrary/issues/7/events","html_url":"https://github.com/inexistence/PictureLibrary/issues/7","id":68020968,"number":7,"title":"关于合并","user":{"login":"inexistence","id":5570012,"avatar_url":"https://avatars.githubusercontent.com/u/5570012?v=3","gravatar_id":"","url":"https://api.github.com/users/inexistence","html_url":"https://github.com/inexistence","followers_url":"https://api.github.com/users/inexistence/followers","following_url":"https://api.github.com/users/inexistence/following{/other_user}","gists_url":"https://api.github.com/users/inexistence/gists{/gist_id}","starred_url":"https://api.github.com/users/inexistence/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/inexistence/subscriptions","organizations_url":"https://api.github.com/users/inexistence/orgs","repos_url":"https://api.github.com/users/inexistence/repos","events_url":"https://api.github.com/users/inexistence/events{/privacy}","received_events_url":"https://api.github.com/users/inexistence/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":0,"created_at":"2015-04-13T06:46:45Z","updated_at":"2015-06-12T08:44:20Z","closed_at":null,"body":"合并\r\n---\r\n合并分为：\r\n\r\n**1.** 将我的项目内容合并到你的项目里，我的项目不变，但你的项目将多出我的项目中新修改的东西。\r\n\r\n**2.** 将你的项目内容合并到我的项目上，我的项目中将多出你项目中新修改的东西，但你的项目本身不变；\r\n\r\n所以在功能完成并push到自己的项目前，进行 **1** ，将我的东西合并到你那里，并在本地进行git pull；\r\n\r\n在push自己的项目后，再进行 **2**，将你新修改后的东西合并到我那里。\r\n\r\n如此两个项目方完全一样。\r\n\r\n判断谁合并了谁\r\n---\r\n\r\n在pull request的Comparing changes中，左侧base fork代表被合并的一方，即会多出新修改的文件的项目，右侧head fork表示比较的项目，即不会被修改的项目。base fork的项目将与head fork项目进行比较，并将head fork中与自己不同的部分取得并进行合并。\r\n\r\n\r\n所以？\r\n---\r\n\r\n为防止大家项目和我的不同，或者我的项目和大家的不同，最好将以上两种合并都进行一次\r\n\r\n"}}