Give ‘rerere’ a try - you won’t need to resolve the same conflict again. Apart from that, conflicts can occur in both cases.
Thanks, I will! How reliably does it work? Any disadvantages compared to merge?
Rerere is just a Git configuration, it can’t be compared to merge. About the differences, there is some more information in the article. : )
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Give ‘rerere’ a try - you won’t need to resolve the same conflict again. Apart from that, conflicts can occur in both cases.
Thanks, I will! How reliably does it work? Any disadvantages compared to merge?
Rerere is just a Git configuration, it can’t be compared to merge. About the differences, there is some more information in the article. : )