I know that there is a feature that git has called rerere which stands for "reuse recorded resolution". This feature (if enabled) records the conflict ...
(Similar to this question, but with some context and demonstration of why rerere is not an answer.) For the given history: I have a topic branch w ...
When doing a merge with rerere enabled, and all conflicts are resolved with rerere, it just prints something like: I would like to see the before d ...
For example "both modified" and "No files need merging"? liar! ...
My workflow usually consists of merge -> resolve conflicts -> commit -> debug during compilation -> fixup commit. In this way I make dirty ...
As I understood, it is useful for the synchronization of projects through the saving of conflict resolution information, but it is not entirely clear ...
I experienced the following situation: I ran into a conflict during a merge with git rerere enabled. I fixed the conflicting file, but other non-co ...
The preimage is the result of merging the old and new files, I get that. The postimage is the way the conflict was resolved, I get that. But what is ...
After merging I get next log: After this I can view how this merge conflicts are resolved: But how can I view original merge conflict? man git ...
git rebase --preserve-merges The doc says that "Merge conflict resolutions or manual amendments to merge commits are not preserved". I understand h ...
Background I am currently resolving a merge conflict with git rerere enabled. git status shows one unmerged path. When I view the file, there are no ...
git rerere happily stores my conflict resolutions and automagically applies them when the same conflicts appear again. However, sometimes, I encounte ...
I am new to Bitbucket, and I am trying to figure out how I might be able to use rerere for Pull Requests. As the admin I would like to try to merge i ...
Can git rerere be configured so it only remembers and applies merge resolutions on certain file patterns? Ie: just on the pattern pom.xml. ...
I received a conflict when trying to merge two files: When I looked into user.py, there is no git-conflict-notation/mark that I was used to: Wha ...
Git rerere provides for reuse of previous conflict resolutions during rebase, and can even stage the resolved files by setting rerere.autoupdate = Tru ...
Here's the deal. master has a file, file1. I branch, and delete that file in the branch. Meanwhile, I modify file1 on master. Boom, conflict. When I ...
I am working through the Git - Rerere section of the Git Book. I have just run git checkout master; git merge rerere2; git rerere diff. Here is the ou ...
Due to a combination of business needs and old habits, our QA/BA team members seem to think they need an ability to seemingly cherry-pick any combinat ...
I'm trying to rebase a branch B over a branch A, but one of the newest commits in A deletes one folder replacing it with a git submodule. After runni ...