Fetch&Rebase (with conflict)

Concept:





Steps:

1. do Sync

2. do Fetch&Rebase

3. TGit Fetch Remote

4. TGit show you the Rebase dialog & Start Rebase

   If conflict
   4.1 do Edit conflicts
   4.2 Save Merge Result
   4.3 Resolved
   4.4 Commit

5. Rebase Done

6. Confirm : Log and Diff



Example:

Move to this wiki