All Questions
Tagged with git-merge-conflict git-diff
10 questions
0
votes
0
answers
61
views
Code disappears in target branch on git merge w/o any indication
I'm having a problem with Git merge. In short, I'm merging the master branch into a feature branch, essentially git checkout feature && git merge master.
This is how it looks graphically:
...
- 4,460
1
vote
1
answer
112
views
Show a combined diff of a merge commit, including added files by either parent branch
After doing a merge which includes changes of a coworker, I want to them, to outline wheat each of us changed and how I resolved the conflicts.
The standard way that git displays merges, however, is ...
- 3,235
2
votes
2
answers
457
views
Change loss in resolving git merge conflict
I just encountered this issue for the third time in my life as a coder. This time I decided to find the root cause, so I spend some time to produce a minimum case.
https://github.com/myst729/git-diff-...
- 13.8k
1
vote
2
answers
1k
views
Find Conflicting files while merging two git branches
I have my main branch 'master' and two derived branches 'branch-a' and 'branch-b'. when i try to merge 'branch-a' in 'branch-b' github desktop checks:
and shows that there will be two conflicting ...
- 43
1
vote
2
answers
2k
views
avoid auto merging of git conflicts and warn if same files getting modified in different branches
Usually when we merge feature branch with master or any other branch and if same file is modified in different branches but on different lines then GIT does resolve the conflict automatically. We dont ...
- 123
1
vote
0
answers
37
views
git conflicts - is there an easy way to get differences between the sections of a conflict?
Given a conflict (or many) in a file, is it possible to easily get differences between the sections of a conflict? I mean, I know I can diff whole files from revisions and stuff but I also know it's ...
- 29.8k
8
votes
1
answer
716
views
Automatic merging in git without conflicts (using word-by-word diff instead of line-by-line)
I’d like to automatically merge commits where each commit changes a different word on the same line. The goal is to use git as a document storage and access it programmatically (thus, ideally without ...
- 725
2
votes
1
answer
438
views
ExcelCompare not working for conflicts
I used ExcelCompare and also some python script to be able to diff Excel files.
When I'm making changes locally it works as expected, I can see the changes before committing.
However, when merging ...
- 2,394
2
votes
1
answer
1k
views
Can anyone help me to understand three window in Meld diff tool
While using Meld I am seeing three vertical sides:
On the left Test.txt.LOCAL.10512.txt
In the middle Test.txt
On the right Test.txt.REMOTE.10512.txt
Can anyone help me to understand these three ...
- 10.5k
24
votes
4
answers
7k
views
Smarter rebase avoiding redundant work (conflict resolution)?
One issue I run into with long rebases is having to resolve redundant conflicts. Say I have a branch with a sequence of commits that keeps modifying a function, and the final commit removes the ...
- 125k