---
title: "(comic) Tell me about a time you resolved a conflict"
url: https://daily.dev/posts/comic-tell-me-about-a-time-you-resolved-a-conflict-y8iahodhn
source_url: https://workchronicles.substack.com/p/comic-tell-me-about-a-time-you-resolved
type: article
source: "Work Chronicles"
published: 2024-11-25T16:21:11.288Z
updated: 2024-12-08T20:39:41.010Z
tags: ["career", "productivity"]
reading_time: 1
upvotes: 166
comments: 2
language: en
---

> ## Documentation Index
> Fetch the complete documentation index at: https://daily.dev/llms.txt
> Use this file to discover all available pages before exploring further.

# (comic) Tell me about a time you resolved a conflict

**[Work Chronicles](https://daily.dev/sources/workchronicles)** · 1 min read · 166 upvotes · 2 comments

## Summary

A comic strip that humorously portrays workplace conflicts and their resolutions. Subscribe to Work Chronicles for more comics about work, fueled by love and coffee.

## Full article

daily.dev links to this article rather than hosting it. Read it at the original source: <https://workchronicles.substack.com/p/comic-tell-me-about-a-time-you-resolved>

## Community discussion

Top comments from developers on daily.dev.

**@kokorolx** · 4 upvotes

> Use this one: `git checkout --ours .`

## Similar posts on daily.dev

- [Don’t just attend KubeCon \+ CloudNativeCon, Merge Forward your experience\!](https://daily.dev/posts/don-t-just-attend-kubecon-cloudnativecon-merge-forward-your-experience--l0rpp73x8) · CNCF · 0 upvotes · 0 comments
- [Announcing H2 2026 KCDs](https://daily.dev/posts/announcing-h2-2026-kcds-m96goajm1) · CNCF · 1 upvotes · 0 comments
- [Two months of Open Community Groups](https://daily.dev/posts/two-months-of-open-community-groups-asf52zhbs) · CNCF · 0 upvotes · 0 comments

---

Tags: [#career](https://daily.dev/tags/career), [#productivity](https://daily.dev/tags/productivity)

[View this post on daily.dev](https://daily.dev/posts/comic-tell-me-about-a-time-you-resolved-a-conflict-y8iahodhn)