Upgrade to Pro — share decks privately, control downloads, hide ads and more …

MERGE CONFLICT: Conflict Resolution for Developers

MERGE CONFLICT: Conflict Resolution for Developers

Tracy Hinds

June 28, 2014

More Decks by Tracy Hinds

Other Decks in Technology


  1. $ git checkout style Switched to branch 'style' $ git

    merge master Auto-merging lib/hello.html CONFLICT (content): Merge conflict in lib/hello.html Automatic merge failed; fix conflicts and then commit the result. She nods.
  2. 1. Understand the conflict 2. Communicate with the opposition 3.

    Brainstorm possible resolutions 4. Choose the best resolution 5. Cope with stressful situations and pressure tactics 6. Rinse and (possibly) repeat. Negotiating the resolution of a conflict:
  3. $ git add lib/hello.html $ git commit -m "Merged master

    fixed conflict." Recorded resolution for 'lib/hello.html'. [style 645c4e6] Merged master fixed conflict. Resolve the conflict manually.
  4. PROPS TO MY RESOURCES Civility in the Digital Age: How

    Companies and People Can Triumph over Haters, Trolls, Bullies and Other Jerks Andrea Weckerle http://ptgmedia.pearsoncmg.com/images/9780789750242/samplepages/0789750244.pdf Suicide Awareness & Prevention for Caregivers & Health Service Providers The Samaritans http://samaritansnyc.org/wp-content/uploads/2013/08/Samaritans-Suicide-Awareness-and- Prevention-Booklet.pdf Effective Communication Skills: Resolving Conflicts Naomi Brower, Jana Darrington http://extension.usu.edu/files/publications/publication/FC_Relationships_2012-02pr.pdf https://yourlogicalfallacyis.com/ Topics to look into for further funtimes: Crisis Counseling Or even better, volunteer and get trained! Conflict Resolution Social Psychology