I created this tool to help reducing and resolving merge conflicts at early stages by monitoring the git logs at a regular laps of time. Feel free to improve the functionnality, PRs are welcomed!
-
Updated
Dec 1, 2023 - C
#
conflict-resolution
Here are 2 public repositories matching this topic...
NAOgest is a software application that explores how the NAO humanoid robot can use expressive hand gestures to improve conflict resolution in customer support. Developed with Webots, the simulation evaluates the effects of verbal and non-verbal behaviors on user trust, empathy, and satisfaction during stressful interactions.
conflict-resolution robotics customer-support human-robot-interaction nao-gestures nao-robot webots social-robotics service-robot hri-simulation nonverbal-communication
-
Updated
Apr 8, 2025 - C
Improve this page
Add a description, image, and links to the conflict-resolution topic page so that developers can more easily learn about it.
Add this topic to your repo
To associate your repository with the conflict-resolution topic, visit your repo's landing page and select "manage topics."