{"pages":[{"page_name":"Git---resolving-conflicts-after-rebasing","title":"Git   resolving conflicts after rebasing","summary":null,"action":"edited","sha":"083de1f772228f58656ead0b509dc6e9d4827e18","html_url":"/chrisonside/devnotes/wiki/Git---resolving-conflicts-after-rebasing"}]}