I know that there is a feature that git has called rerere which stands for "reuse recorded resolution". This feature (if enabled) records the conflicts and their resolutions. That's great. But this feature also automatically resolves conflicts. That is a huge problem for us since we don't want automatic conflict resolution. Is there a way to use rerere to record the conflicts and their resolutions but NOT perform automatic resolutions? If not, is there a different way this could be done? Perhaps there is a GitHub plugin for this? (we use GitHub and I couldn't find such a plugin). Thanks.
How to record git merge conflicts and their resolutions but without automatically resolving conflicts?
206 Views Asked by Eyal Gerber At
1
There are 1 best solutions below
Related Questions in GIT
- problem to push files on a repository git
- diff3 output in git conflict style, including mergeable hunks
- Git Not In Sync with Local Branch
- Setting up the version control of .dotfiles while the .config is connected to a forked repo
- How to fix overriding the main branch in Git?
- I can't add text to "Message" in VS Code when committing to Git
- How can i redirect pull request from main branch to another branch
- Xcode commits (possibly outside of any branch) disappeared, how to get them back?
- Git/TortoiseGit : how to apply ONLY the changes from ONE commit from branch A, to branch B?
- How can I reintroduce username an password on git using fedora?
- GIT SKIP EMPTY DIRECTORIES
- Git smudge run once per checkout or per commit?
- I can't find ~/.profile or ~/.bashrc in C:/Users/<user>/.ssh folder
- Set environment variable during push for GitHub Actions
- Android WebRTC compile
Related Questions in GIT-RERERE
- How can I avoid fixing other peoples merges when doing a git rebase
- How to prevent git from applying recorded changes during a git revert
- `git` get metrics on how often `rerere` resolutions are used
- Squashing first few dozens of git commits that contain merge commits
- How can I teach `git-rerere` about the resolutions in an existing merge commit, with the least manual intervention
- Is there a reason Git ReReRe might not succeed?
- How to record git merge conflicts and their resolutions but without automatically resolving conflicts?
- How can I see what "previous resolution" git applied?
- Why does git not automatically reapply conflict resolutions when performing a rebase-merges rebase?
- Programmatically display all git rerere resolutions used during merge
- git says "No files need merging" immediately after a merge conflict
- How to "fixup" git rerere resolution
- What is git-rerere and how does it work?
- Is there a way to limit rerere to certain directories?
- Git rerere and resolution covering non-conflicting files
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
We resolved this by simply defining a process that upon every merge from branch A to branch B with conflicts, the merge shall be done from B to A first while pushing the conflicts as-is (yes, in that commit the code will not compile). Then make another commit on branch A after resolving the conflicts. Then merge that into branch b with a pull request. This way, when a code review is done on the pull request, the reviewer can see the conflicts and how they were resolved before approving the merge.