rerere   47

Fix conflicts only once with git rerere
So you fixed a conflict somewhere in your repo, then later stumbled on exactly the same one (perhaps you did another merge, or ended up rebasing instead, or cherry-picked the faulty commit elsewhere…
git  rerere  important 
february 2017 by vonc
Fix conflicts only once with git rerere
Fixing conflicts is chore enough not to do the same ones over and over again. See how rerere makes Git remember your con…
git  conflicts  rerere  share 
february 2015 by stuarth

related tags

aggressive  article  bb  branch  branches  chacon  checkout  cherry-pick  clean  commands  conflict  conflicts  decrease  delete  delicious  dev  diff  diff3  diminsih  doc  docs  dvcs  expire  forget  gc  git-cherry-pick  git-rebase  git-rerere  git  hehehe  howto  illustrated  important  interesting  knowledge  matthew-mccullough  mediate  merge  opensource  plasticscm  preserve-merge  programming  rebase  record  redo  reference  reflog  refs  remove  replay  repository  resolution  resolve  share  size  so  stackoverflow  stars:5  to-grok  to-read  to-share  tools  topic  workflow 

Copy this bookmark: