How Git rebase conflicts workhttp://h2.jaguarpaw.co.uk/posts/git-rebase-conflicts/ by lharries • 6 years ago 3 0 6 years agoH2h2.jaguarpaw.co.uk