MERGE CONFLICT: Conflict Resolution for Developers

Transcript

1. MERGE
   Conflict Resolution for Developers
   CONFLICT
   

   View Slide

2. Tracy Hinds
   @hackygolucky
   @hackygolucky
   Urban Airship
   Web Engineer
   

   View Slide

3. DISCLAIMER:
   For those who I have wronged and have
   yet to annoy.
   THANKS!
   and a ...
   

   View Slide

4. Put up your dukes
   

   View Slide

5. Conflict.
   It’s a thing.
   

   View Slide

6. Conflict.
   It’s a thing!
   HEALTHY
   

   View Slide

7. $ 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.
   

   View Slide

8. 140 characters
   Context is king.
   

   View Slide

9. 140 characters
   Context is king.
   lacking.
   

   View Slide

10. Words are powerful.
    

    View Slide

11. Words are powerful.
    Tone matters
    

    View Slide

12. Words are powerful.
    Tone matters
    Though, sometimes we wish
    that wasn’t the case.
    

    View Slide

13. View Slide

14. shouldn’t be
    in the conversation.
    YOU
    

    View Slide

15. 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:
    

    View Slide

16. $ 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.
    

    View Slide

17. CHOOSE YOUR OWN
    ADVENTURE
    

    View Slide

18. 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
    

    View Slide

19. (This is Portland. You should visit!)
    

    View Slide