2
Stop resolving the same merge conflict multiple times during merge or rebase usi...
source link: https://pawelgrzybek.com/stop-resolving-the-same-merge-conflict-multiple-times-during-merge-or-rebase-using-git-rerere/
Go to the source link to view the article. You can view the picture content, updated content and better typesetting reading experience. If the link is broken, please click the button below to view the snapshot at that time.
Stop resolving the same merge conflict multiple times during merge or rebase using git rerere
Published: 2024.01.29 · 1 minute read
If you read it, you probably experienced a continued queue of resolving the same merge conflict multiple times while merging or rebasing git branches. Wouldn’t it be helpful if git could “reuse recorded resolution” for us? The “rerere” tool does precisely that, and you can enable it using the command below.
git config --global rerere.enabled true
# .gitconfig
[rerere]
enabled = true
Thanks for this tip Max 🫶
Did you like it? Please share it with your friends or get me a
beer coffee. Thanks!
Leave a comment#
Name:
Website (optional):
GitHub (optional):
Comment:
Save my data for the next time I comment👆 you can use Markdown here
Recommend
About Joyk
Aggregate valuable and interesting links.
Joyk means Joy of geeK