{
  "video_id": "reddit_1u5c0r6",
  "channel_slug": "programming",
  "channel_handle": "r/programming",
  "title": "Git merges can be better",
  "url": "https://www.reddit.com/r/programming/comments/1u5c0r6/git_merges_can_be_better/",
  "external_url": "https://brandondong.github.io/blog/git_merges_can_be_better",
  "upload_date": "20260614",
  "published_at": "2026-06-14T05:01:11+00:00",
  "transcript": "\n\n--- Top Comments ---\n\n\n[118 upvotes] The most important git trick I ever learned was to set `conflictstyle=diff3`. Then whenever git marks a conflict, it includes a third middle section in the middle with the text from the shared ancestor of the conflicting commits. The difference between middle and top is the change on one branch. The difference between middle and bottom is the change on the other branch. Replace with text that captures the spirit of both changes.\n\n[78 upvotes] after this many years I still have not internalized what --ours and --theirs and LOCAL and REMOTE mean... ",
  "transcript_chars": 592,
  "ingested_at": "2026-06-14T13:30:40.679657+00:00",
  "source": "reddit",
  "yt_meta": {
    "score": 75,
    "upvote_ratio": 0.87,
    "num_comments": 57,
    "author": "agentvenom1",
    "is_self": false
  }
}