git-rerere

What is git-rerere and how does it work?

拈花ヽ惹草 提交于 2019-11-28 10:24:37
As I understood, it is useful for the synchronization of projects through the saving of conflict resolution information, but it is not entirely clear to me how to use and configure it. I want to configure for my continuous integration (CI) environment. Is it recommended do this? Please don't mark a duplicate with this other question: Are there any downsides to enabling git rerere? . Because my doubt isn't related to "So is there any downside to enabling rerere?. What potential problems can it cause that would not otherwise occur?" What is git rerere ? As the documentation notes, rerere stands

Have git rerere automatically mark files as resolved?

徘徊边缘 提交于 2019-11-27 14:39:44
问题 I'm using git rerere, and it is useful, but there is one problem: When it automatically resolves a file, it does not mark it as resolved (eg with git add). So if I run 'git mergetool', it opens up the file as if it still has all the conflicts in it. So far, I've made a small shell script which I can call, which scans all files marked as conflicted for conflict markers (eg >>>>>>> ), and calls git-add on them if they have none. Is there a better way of doing this? Some flag to git rerere I

Sharing rerere cache

99封情书 提交于 2019-11-27 06:55:36
I've seen people recommend that all developers set up a symlink on their machine from C:\project\.git\rr-cache to a shared folder \\server\rr-cache . However, it would seem more convenient to share the folder by including it in the git repository itself, if that is possible. I've seen people mention this solution, but not actually how to do it. Any ideas? It can be shared via a dedicated branch. You want to stop if there is a conflict on that branch and resolve it as it means that there were attempts to solve the same conflict in 2 different ways. Needless to say, that will be the exception to

What is git-rerere and how does it work?

与世无争的帅哥 提交于 2019-11-27 02:22:51
问题 As I understood, it is useful for the synchronization of projects through the saving of conflict resolution information, but it is not entirely clear to me how to use and configure it. I want to configure for my continuous integration (CI) environment. Is it recommended do this? Please don't mark a duplicate with this other question: Are there any downsides to enabling git rerere?. Because my doubt isn't related to "So is there any downside to enabling rerere?. What potential problems can it

Are there any downsides to enabling git rerere?

五迷三道 提交于 2019-11-26 18:37:07
I've read various things about git's rerere feature, and I'm considering enabling it. But I haven't seen anyone mention any possible problems that could arise while using it. I have to assume there is a downside, or it would probably be enabled by default. So is there any downside to enabling rerere? What potential problems can it cause that would not otherwise occur? MatrixFrog If you do a merge incorrectly, then discard it, then do the "same" merge again, it will be incorrect again. You can forget a recorded resolution, though. From the documentation : git rerere forget <pathspec> This

Sharing rerere cache

廉价感情. 提交于 2019-11-26 17:36:07
问题 I've seen people recommend that all developers set up a symlink on their machine from C:\project\.git\rr-cache to a shared folder \\server\rr-cache . However, it would seem more convenient to share the folder by including it in the git repository itself, if that is possible. I've seen people mention this solution, but not actually how to do it. Any ideas? 回答1: It can be shared via a dedicated branch. You want to stop if there is a conflict on that branch and resolve it as it means that there

Are there any downsides to enabling git rerere?

只愿长相守 提交于 2019-11-26 06:28:13
问题 I\'ve read various things about git\'s rerere feature, and I\'m considering enabling it. But I haven\'t seen anyone mention any possible problems that could arise while using it. I have to assume there is a downside, or it would probably be enabled by default. So is there any downside to enabling rerere? What potential problems can it cause that would not otherwise occur? 回答1: If you do a merge incorrectly, then discard it, then do the "same" merge again, it will be incorrect again. You can