{"action":"created","issue":{"url":"https://api.github.com/repos/MarlinFirmware/Marlin/issues/2344","labels_url":"https://api.github.com/repos/MarlinFirmware/Marlin/issues/2344/labels{/name}","comments_url":"https://api.github.com/repos/MarlinFirmware/Marlin/issues/2344/comments","events_url":"https://api.github.com/repos/MarlinFirmware/Marlin/issues/2344/events","html_url":"https://github.com/MarlinFirmware/Marlin/issues/2344","id":91545452,"number":2344,"title":"How do I fix my fork?","user":{"login":"thinkyhead","id":698003,"avatar_url":"https://avatars.githubusercontent.com/u/698003?v=3","gravatar_id":"","url":"https://api.github.com/users/thinkyhead","html_url":"https://github.com/thinkyhead","followers_url":"https://api.github.com/users/thinkyhead/followers","following_url":"https://api.github.com/users/thinkyhead/following{/other_user}","gists_url":"https://api.github.com/users/thinkyhead/gists{/gist_id}","starred_url":"https://api.github.com/users/thinkyhead/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/thinkyhead/subscriptions","organizations_url":"https://api.github.com/users/thinkyhead/orgs","repos_url":"https://api.github.com/users/thinkyhead/repos","events_url":"https://api.github.com/users/thinkyhead/events{/privacy}","received_events_url":"https://api.github.com/users/thinkyhead/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/MarlinFirmware/Marlin/labels/Developers","name":"Developers","color":"FF77AA"},{"url":"https://api.github.com/repos/MarlinFirmware/Marlin/labels/Documentation%20Issue","name":"Documentation Issue","color":"fef2c0"},{"url":"https://api.github.com/repos/MarlinFirmware/Marlin/labels/Not%20a%20bug","name":"Not a bug","color":"fef2c0"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2015-06-28T02:54:07Z","updated_at":"2015-06-28T13:50:53Z","closed_at":null,"body":"Since __Development__ was replaced with the contents of __dev__, when I make a PR from my fork's my __Development__ branch it has lots of extra items. How can I fix up my fork so that it has the same __Development__ branch as __MarlinFirmware__ now has?"},"comment":{"url":"https://api.github.com/repos/MarlinFirmware/Marlin/issues/comments/116280253","html_url":"https://github.com/MarlinFirmware/Marlin/issues/2344#issuecomment-116280253","issue_url":"https://api.github.com/repos/MarlinFirmware/Marlin/issues/2344","id":116280253,"user":{"login":"Wackerbarth","id":505323,"avatar_url":"https://avatars.githubusercontent.com/u/505323?v=3","gravatar_id":"","url":"https://api.github.com/users/Wackerbarth","html_url":"https://github.com/Wackerbarth","followers_url":"https://api.github.com/users/Wackerbarth/followers","following_url":"https://api.github.com/users/Wackerbarth/following{/other_user}","gists_url":"https://api.github.com/users/Wackerbarth/gists{/gist_id}","starred_url":"https://api.github.com/users/Wackerbarth/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Wackerbarth/subscriptions","organizations_url":"https://api.github.com/users/Wackerbarth/orgs","repos_url":"https://api.github.com/users/Wackerbarth/repos","events_url":"https://api.github.com/users/Wackerbarth/events{/privacy}","received_events_url":"https://api.github.com/users/Wackerbarth/received_events","type":"User","site_admin":false},"created_at":"2015-06-28T13:50:53Z","updated_at":"2015-06-28T13:50:53Z","body":"@thinkyhead -- Since you are using Mac OS X, I suggest that you consider GitX http://rowanj.github.io/gitx/\r\nThe graphical interface helps you visualize the branching structure.\r\n\r\nAs a workflow, I would suggest that you rebase on rather than performing your often merges of the MarlinFirmware:Development branch.\r\n\r\nFor your convenience, I have cleaned up your commits leading to the creation of your ENABLE/DISABLE macro stuff. You might add my repo as a remote to yours and adopt (NOT MERGE) my version of redo_overrides_1 as a replacement for your own.\r\nYou should also adopt the MarlinFirmware:Development branch instead of your own that was merged."}}