mirror of
https://github.com/git-for-windows/git.git
synced 2026-04-23 11:11:44 -05:00
This adds an extensive section about resolving merge conflicts during rebases, which happens quite often in Git for Windows' day-to-day. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
928 B
928 B