This tutorial helps you to learn how to handle a merge conflict in git. It's smart to practice conflict resolution ahead of time, rather than when you are frazzled by a conflict in a real project.
See the file git-conflict-resolution.html.
-
Notifications
You must be signed in to change notification settings - Fork 0
mernst/git-conflict-tutorial
Folders and files
| Name | Name | Last commit message | Last commit date | |
|---|---|---|---|---|
Repository files navigation
About
A tutorial about how to manage git conflicts
Resources
Stars
Watchers
Forks
Releases
No releases published
Packages 0
No packages published