Using Git's rerere feature to escape recurring conflict hell

3 comments

• 0123456789ABCDE 44 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

• davidelettieri 11 minutes ago

  I'm using these options https://blog.gitbutler.com/how-git-core-devs-configure-git and I'm happy with it

• cautiouscat 28 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.