I often rebase a large open source project and there are merge conflicts where I need to figure out who made the change and when in order to decide as to which change to take. So generally what I do is that I go to both repos and look at the file and do a git blame. Is there a mergetool that will provide this info during conflict resolution. I would like to know who made and this change and when for each version. Right now I am using meld.
git blame while resolving merge conflicts
2.1k Views Asked by Salil Surendran 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 GIT-MERGE
- How to determine if Git merge is in process
- How to list merge conflicts on origin that are not on local?
- Feature branch with or without fast-forward merge?
- merge master into subtree branches
- GIT HOOK to check keyword "PROMOTE" in message when GIT MERGE is executed
- hint: after resolving the conflicts, mark the corrected paths
- git auto-merge does not work as expected
- Git: Merging very large master branch with a feature branch
- Include (realign) some branch changes into other branch
- Git - coworker somehow overwrote my entire commit while resolving a conflict
- How can a revert commit also be a merge commit?
- git cant resolve rebase conflicts as mergetool doesnt pop up
- Merge git repositories with different base dir
- Why does 'git merge' add files ending with tilde?
- Git Merge Specifics Commits
Related Questions in MERGE-CONFLICT-RESOLUTION
- How to list merge conflicts on origin that are not on local?
- Git - coworker somehow overwrote my entire commit while resolving a conflict
- Troubles with git and Gemfile.lock
- Git consistently merging one file incorrectly
- Merge conflict, when branches aren't modifying the same line
- Can Git automatically handle insertions when resolving merge conflics?
- Unknown build issue (app:transformClassesWithJarMergingForDebug)
- git blame while resolving merge conflicts
- Why does path-restricted 'git log' omit merge commits with interesting conflict resolutions?
- git rebase --continue vs. new commit
- What is the default behaviour of "Resolve using theirs" in git
- Avoid merge conflicts in stylesheets
- Can git diff be configured to not indicate a conflict on created files with same content?
- How can keep master files after merge conflict in git
- Why is git removing rows that were added on one branch when merging?
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?
Beside gitk, you can try
git blame -L '/^<<<</,/^>>>>/' -- {filename}: this is not integrated to a mergetool, but can be done for all conflicted files first.Then you launch mergetool.