Commiting before pulling
Resolving merge conflicts
Resolving merge conflicts
Resolving merge conflicts