I'm trying to find merge revisions on projects that had conflicts in the past. Is there an easier way to do it than to replicate the merge by hand? Because I haven't been able to find a way to make git show list only the files where there were conflicts (if any).
How can I get a list of conflicted files on merge commits (after the fact)
275 Views Asked by eftshift0 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 MERGE
- Purpose of last 2 while loops in the merge algorithm of merge sort sorting technique
- Having trouble merging these two datasets for a Spatial Analysis
- Merge Azure mp4 blobs via API (Preferred Azure)
- Git merge strategies vs. merge drivers vs. mergetools
- Merge Request in Bitbucket: Possible to exempt a specific branch to ask for Merge Request?
- How to properly extend the generic interface with a new generic parametr using decration merging in Typescript?
- Merge effective dated records of an attribute with the main effective dated table (SQL)
- How do I merge multiple tables into a new table in BigQuery?
- Exclude a file from merging to the main branch
- Usage of merge in linux sort utility
- How can I collapse repeated missing observations into a single nonmissing observation for the same ID in SAS?
- Best way to automate auto-merging git branches
- git: merging a branch that's already been merged by mistake
- Dynamically create, merge & save dataframes in a for loop
- VBA find matching Excel files with a subtext - and merge them into single new file
Related Questions in CONFLICT
- Yocto conflicting error while building rootfs
- How to resolve a merge conflict in Git?
- Dependency Conflict with TOCropViewController in React Native Project
- R package building: importing functions with identical names
- i want to use im my requirements.txt this tensorflow~=2.3.0 version but i get an error
- Merge happens in reverse way while using GitHub
- Auto-conflict detection and resolution in Maria DB
- Remove git merge commit without conflict
- How to set utf-8 as default encoding for pull request merge conflict extension in azure devops?
- How to resolve version conflict for Parselmouth and Pandas during installation of pytz?
- AlpineJS conflict x-data with VueJS
- Ionic Framework generate and Angular ESLint 02-03 styleguide rule component naming conflict
- Ignoring files that are not present in the destination branch when merging a source branch into it with git
- Tailwind background utility class not working in Next.js(pages router)
- How to support "FULL JOIN" clause
Related Questions in GIT-SHOW
- git show results in fatal: ambiguous argument unknown revision or path not in the working tree when branch contains forward slash (/)
- Is there any way to see which commit is cherry-picked to a commit?
- confused about 'git diff' and 'git show' on branch
- Git show : view file in my usual editor, Qt Creator
- git checkout commit with specific trailer
- git show name only with filename containing special char interpret the character
- Git show: Show blob in revision selected by text
- How to tell "git show" not to show any diffs?
- git show: confusing behavior when showing past version of a file
- Why does git diff and git show seem to replace tabs with spaces?
- What is the git command to get only the newly added/modified lines in a commit?
- How to print commit dates in %Y%m%d format in git log?
- Git returns "forbidden" when trying to view origin URL
- How to show a git message body (not just the title)?
- What does HEAD~n^k does on git?
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 # Hahtags
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?
It's not possible in general.
The only reliable method is to repeat the merge, and even then, you must know several things that are not knowable from the repository itself. In particular, you must know:
-X find-renames, if there was any such argument-X oursor-X theirswas supplied-s, if there was any such argumentSince most merges don't use these arguments, you can get pretty close by repeating the merge, and that's far easier than any alternative. (If you have
git worktree addor are willing to make a clone, it's easy to automate.)(It would be nice if
git mergestashed these merge arguments as a comment in a header line in the merge commit. Git would have to save them in a file for merges that stop in the middle, but that is obviously possible.)