Changes between Version 88 and Version 89 of DeveloperGuidelines/Git
- Timestamp:
- 01/03/14 03:38:58 (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DeveloperGuidelines/Git
v88 v89 168 168 # what you're doing: 169 169 git rebase --abort 170 }}} 170 171 171 172 ==== Resolving Merge Conflicts ====