Git merge conflict Tabbing in BASE
I try to merge branch A to branch B. Both in A and B had inconsistent tabbing previously due to team work, but we fixed and the current version on A and B has the same tabbing. Now, when I try to merge the two branches I have merge conflicts (not due to the tabbing). When I try to solve the conflicts with meld (also tried with kdiff3, same thing) as mergetool, the LOCAL and REMOTE is with the same tabbing but the BASE is with the old tabbing as shown in the picture:
Why does this happen? It is hard to go through the tabbing fixes and also look for the conflicts during mrege. How can this be fixed?
As the image shows the old tabbing in your BASE comes from the first common ancestor of the modified file in branch A and branch B. Then everything is going as expected.
You can try to add a hunk from any side (LOCAL or REMOTE) over the hunk with the old tabbing in BASE, since it is an outdated hunk. It should clarify the conflicts resolution.
Can you provide the full image or the BASE, REMOTE and LOCAL files from the conflict in something like a gist?
this answer should be a comment, but i don't have reputation enough
- What's the simplest way to list conflicted files in Git?
- How to "git merge" without creating a merge commit?
- How to restore linear git history after nonlinear merge?
- How to import existing Git repository into another?
- Git: Default "no commit" merge behaviour for all branches?
- git merge reverted but the changes needed
- What does merge xx into xxx mean
- iOS - best practice for managing code merge in a storyboard
- What are the downsides to rebasing topic branches instead of merging?
- Merging changes from master into my branch
- How to get back deleted files in git
- During a Git merge conflict resolution, can I check out the conflicting state of a file?
- How to create a GitLab merge request via command line
- fast forward merge of outdated master
- Merge files with different end-of-line character
- Completely replace master branch with migration branch
- Apply a few changes from a feature branch to main branch without merging
- Does the master branch get modified when I merge it into another branch?
- Local Commits after merging
- How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"
- Squash Git commits *non-interactively* with git rebase
- error: Your local changes to the following files would be overwritten by checkout
- Bitbucket - Syncing Branch with another Branch
- git lost a commit after stash and merge
- How do I resolve merge conflicts in a Git repository?
- Keeping diverging branches in sync with each other
- Found a swap file by the name
- Git pull - Please move or remove them before you can merge
- git forward merging a couple of commits only
- The following untracked working tree files would be overwritten by merge, but I don't care