Eugen Konkov
Reputation: 25113
Is there a git option to show the parent line of a source code when merge conflict occurred?
Is there a git option to show the parent line of a source code when merge conflict occurred?
I want to see the line like == line below:
== value = aws_instance.www[*].public_ip
- value = coalescelist(aws_instance.www[*].public_ip, ["None"])
- value = aws_instance.client_node[*].public_ip
++ value = coalescelist(aws_instance.client_node[*].public_ip, ["None"])
Upvotes: 0
Views: 30
Answers (1)
ventsyv
Reputation: 3532
You can do a 3-way diff by running git mergetool <file>
You can set mergetool in the git config to you favorite diff tool (meld, bc, diffuse, or whatever)
Upvotes: 0
Related Questions
- Throw away local commits in Git
- Showing which files have changed between two revisions
- When do you use Git rebase instead of Git merge?
- I ran into a merge conflict. How do I abort the merge?
- How to stop tracking and ignore changes to a file in Git?
- How to grep (search through) committed code in the Git history
- How can I selectively merge or pick changes from another branch in Git?
- git cherry-pick says "...38c74d is a merge but no -m option was given"
- Is there a git-merge --dry-run option?
- How to compare files from two different branches