{"comment":{"url":"https://api.github.com/repos/gunrock/gunrock/comments/15711353","html_url":"https://github.com/gunrock/gunrock/commit/aa63ff2191b13562f3901a614793f9db6bacc9bd#commitcomment-15711353","id":15711353,"user":{"login":"sgpyc","id":5521410,"avatar_url":"https://avatars.githubusercontent.com/u/5521410?v=3","gravatar_id":"","url":"https://api.github.com/users/sgpyc","html_url":"https://github.com/sgpyc","followers_url":"https://api.github.com/users/sgpyc/followers","following_url":"https://api.github.com/users/sgpyc/following{/other_user}","gists_url":"https://api.github.com/users/sgpyc/gists{/gist_id}","starred_url":"https://api.github.com/users/sgpyc/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/sgpyc/subscriptions","organizations_url":"https://api.github.com/users/sgpyc/orgs","repos_url":"https://api.github.com/users/sgpyc/repos","events_url":"https://api.github.com/users/sgpyc/events{/privacy}","received_events_url":"https://api.github.com/users/sgpyc/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":"","commit_id":"aa63ff2191b13562f3901a614793f9db6bacc9bd","created_at":"2016-01-27T17:05:06Z","updated_at":"2016-01-27T17:05:06Z","body":"The actual merging issue is caused by pervious \"revert\" commits in master branch: I wrongly committed changes to master, @yzhwang helped move them into dev and revert them in master; when merging @wetliu 's branch (which was based on master) into dev, the reverts took effect in dev too (because reverts are more recent than the original commits), resulting in lost of update in original commits.\r\nThe step took to resolve this was reverting the revert commits, which essentially enabled changes from the original commits.\r\nLesson? Start from dev branch, instead of master, when starting new development and not absolutely sure that should directly apply to master. Merge back / pull into dev also."}}