{"action":"created","issue":{"url":"https://api.github.com/repos/drush-ops/drush/issues/1412","labels_url":"https://api.github.com/repos/drush-ops/drush/issues/1412/labels{/name}","comments_url":"https://api.github.com/repos/drush-ops/drush/issues/1412/comments","events_url":"https://api.github.com/repos/drush-ops/drush/issues/1412/events","html_url":"https://github.com/drush-ops/drush/pull/1412","id":82057717,"number":1412,"title":"Allow config-merge --git to operate on commits already in the repository.","user":{"login":"greg-1-anderson","id":612191,"avatar_url":"https://avatars.githubusercontent.com/u/612191?v=3","gravatar_id":"","url":"https://api.github.com/users/greg-1-anderson","html_url":"https://github.com/greg-1-anderson","followers_url":"https://api.github.com/users/greg-1-anderson/followers","following_url":"https://api.github.com/users/greg-1-anderson/following{/other_user}","gists_url":"https://api.github.com/users/greg-1-anderson/gists{/gist_id}","starred_url":"https://api.github.com/users/greg-1-anderson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/greg-1-anderson/subscriptions","organizations_url":"https://api.github.com/users/greg-1-anderson/orgs","repos_url":"https://api.github.com/users/greg-1-anderson/repos","events_url":"https://api.github.com/users/greg-1-anderson/events{/privacy}","received_events_url":"https://api.github.com/users/greg-1-anderson/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":1,"created_at":"2015-05-28T18:04:52Z","updated_at":"2015-05-29T19:13:51Z","closed_at":null,"pull_request":{"url":"https://api.github.com/repos/drush-ops/drush/pulls/1412","html_url":"https://github.com/drush-ops/drush/pull/1412","diff_url":"https://github.com/drush-ops/drush/pull/1412.diff","patch_url":"https://github.com/drush-ops/drush/pull/1412.patch"},"body":"If you do not include a target site argument, then config-merge will assume that the configuration changes that you want to merge with have already been committed to the git repository.  You can include --branch=x if the configuration was committed to some other branch 'x'.\r\n\r\nThis PR also handles a common development workflow, where multiple developers are all working on the \"master\" branch, with each developer pushing new commits to master whenever they are ready.  This means that, at config-merge time, a given developer might be both ahead and behind of the master branch.  To allow the merge to happen with a single invocation of the merge tool, we move the local commits that have not yet been pushed to a temporary working branch, and then reset the master branch back to the last commit that is already on the central repository.  This allows the pull from master to happen without an error.  All of the commits end up back on the master branch at the end, after we merge the branches together and run the merge tool (if necessary).\r\n\r\nIf something goes wrong in the command, we are careful to roll back the master branch to the state it was in before we moved the un-pushed commits to another branch."},"comment":{"url":"https://api.github.com/repos/drush-ops/drush/issues/comments/106906330","html_url":"https://github.com/drush-ops/drush/pull/1412#issuecomment-106906330","issue_url":"https://api.github.com/repos/drush-ops/drush/issues/1412","id":106906330,"user":{"login":"weitzman","id":7740,"avatar_url":"https://avatars.githubusercontent.com/u/7740?v=3","gravatar_id":"","url":"https://api.github.com/users/weitzman","html_url":"https://github.com/weitzman","followers_url":"https://api.github.com/users/weitzman/followers","following_url":"https://api.github.com/users/weitzman/following{/other_user}","gists_url":"https://api.github.com/users/weitzman/gists{/gist_id}","starred_url":"https://api.github.com/users/weitzman/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/weitzman/subscriptions","organizations_url":"https://api.github.com/users/weitzman/orgs","repos_url":"https://api.github.com/users/weitzman/repos","events_url":"https://api.github.com/users/weitzman/events{/privacy}","received_events_url":"https://api.github.com/users/weitzman/received_events","type":"User","site_admin":false},"created_at":"2015-05-29T19:13:51Z","updated_at":"2015-05-29T19:13:51Z","body":"I'm finding it hard to give meaningful reviews on config-merge. It is too complex for me. I am wondering if it is time to move it to contrib. It can be a suggested package in our composer.json if you want."}}