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)
274 Views Asked by eftshift0 At
1
There are 1 best solutions below
Related Questions in GIT
- Push mysql database script to server using git
- Git show's file path
- Git > diffs filtered, show only certain changed classes/files
- Pushing to git repository hosted by Visual studio online without entering user name and password
- How do I create my own Git branch to work on?
- Git init --bare giving error fatal: Out of memory? mmap failed: No such device
- Sub-directory into independent repository and later merge back into main repository
- How to find the Git Revision Hash in a synced SVN repo using SubGit?
- eclipse errors when try to change to master git branch
- How to have Heroku build my development branch on a staging server?
- Is "Merged in" a commit message created by bitbucket, or git?
- Git: Multiple projects under one directory
- Permission denied hg-git
- Is it possible to clone a private git repo without adding ssh keys
- Track file in master repository which is ignored in submodule
Related Questions in MERGE
- Sub-directory into independent repository and later merge back into main repository
- R: Avoid loop or row apply function
- neo4j load csv invalid "ON MATCH"
- PIG merge two lines in the log
- In SVN, what's the different between "merge from a to b" an "merge from b to a"?
- git merge "deleted by us"
- Merge sort using CUDA: efficient implementation for small input arrays
- Merge project from other branch git
- Get a single line representation for multiple close by lines clustered together in opencv
- merge or mutate a summary (dplyr)
- How to I combine data from two XML files into the same structure?
- Merging PDF files with similar names using PDFTK and a bash script
- git has problems with squashing commits once there is "Merge branch"
- How can I combine elements at the same index from separate lists?
- Merging two sorted stacks
Related Questions in CONFLICT
- Reuse jquery plugin without conflict
- GIT Source Tree Merge Develop Branch into Stage Branch Conflict
- CouchDB Merging Revisions (conflict)
- javascript function conflict or css select conflict
- find the number of all possible combinations with conflicts
- CONFLICT (content): Merge conflict in
- Skrollr - any other jQuery animation conflict
- Nginx Subdomain/Staging Server conflicting server name
- Conflict issue when multi developers work on same task
- Composer avoid installing sub-dependency
- Run this JS on selected blog posts types (Tumblr)
- How to resolve Deleted merge conflict in TortoiseGit?
- c++ Binary tree conflicting types error
- Stop execution until User selects a button from the Alert Dialog
- Conflicting components Joomla
Related Questions in GIT-SHOW
- git diff: many patches with three '@' symbol
- Git show whole file changes
- In git, how do I view a previous version of an image file?
- How to get rid of the ... at the output of the show command in Git
- How do I match all but the first matches in a line with sed?
- What is the difference between "git show test.rb" and "git show HEAD:test.rb"?
- git show printing unwanted tag info
- Using `git show` to create and apply patches spanning multiple commits
- have "git show" use opendiff on osx to show commits
- What is the git command to get only the newly added/modified lines in a commit?
- git show: formatting is changed after redirection to file
- How to get visual output when git reset modifies HEAD and Staging Index states?
- How to tell "git show" not to show any diffs?
- Git show: Show blob in revision selected by text
- git checkout commit with specific trailer
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?
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.)