• From the git List
• Patch series, Rebase and Merge conflicts: When and where
• merging-rebase, as used in Git for Windows.