{
  "$type": "site.standard.document",
  "bskyPostRef": {
    "cid": "bafyreig5bzj6cl4n2wmer2vuxqfjx5b5ihkcsvekcqosluucakgnvlguge",
    "uri": "at://did:plc:4n6wgsqsqm6q2hjncgwmreey/app.bsky.feed.post/3miqg2w3nl3v2"
  },
  "path": "/post/48292412",
  "publishedAt": "2026-04-04T20:32:34.000Z",
  "site": "https://programming.dev",
  "tags": [
    "Learn Programming",
    "ZILtoid1991",
    "learn_programming",
    "13 comments"
  ],
  "textContent": "submitted by ZILtoid1991 to learn_programming\n10 points | 13 comments\n\nToday I did a `git push --force`, then I had to create a branch out of the old code, but other times I had to save the files I worked on, delete the local repository, `git clone` again, then reapply my fixes. I want to at least have a bookmark on how to fix things in the future.\n\nYes, I’ve heard about VSCode plugins, that supposed to help. But no, I don’t want to use a glorified webpage to do coding, regardless if it’s directly tied to Micro$lop, or some of the slop was removed by 3rd parties. I tried KATE once, I cannot go back to some sluggish webpage, which only argument for use at the moment is “but it has plugins”.",
  "title": "Where can I find documentations on how to resolve a git conflict properly?"
}