NHacker Next
  • new
  • past
  • show
  • ask
  • show
  • jobs
  • submit
Using Git's rerere feature to escape recurring conflict hell (gist.github.com)
0123456789ABCDE 33 minutes ago [-]

  #~/.config/git/config
  [rerere]
      enabled = true
      autoUpdate = true
while you're editing git config, consider these:

    [pull]
      rebase = true

  [rebase]
      autoSquash = true
      autoStash = true

  [merge]
      # zdiff3 adds original text markers and removes matching lines from conflict regions
      # https://git-scm.com/docs/git-config#Documentation/git-config.txt-mergeconflictStyle
      conflictStyle = zdiff3
      autoStash = true

  [push]
      autoSetupRemote = true
      default = simple

  [init]
      defaultBranch = main
cautiouscat 17 minutes ago [-]
Every time I think I am adept in git, something like this is shown to me. I really should read into it more lol.
Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact
Rendered at 13:09:11 GMT+0000 (Coordinated Universal Time) with Vercel.