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
- Is there a difference between git rebase and git merge --ff-only
- Git Rebase Dilemma: Sort out the tangled feature branches
- How do I perform GitHub’s “Rebase and merge” in git with a single command?
- How to better merge changes in git when a module was split into two smaller files?
- How to make git cherry pick use fast forward technique
- Under which circumstances does git silently skip a commit during a merge
- How do I safely merge a Git branch into master?
- Is there a "theirs" version of "git merge -s ours"?
- $REMOTE point to different branches in git merge vs. rebase?
- How can I view manual changes so far in an ongoing merge?
- How to organize git cherry-pick action?
- Is there a way to specify a default option for merging a pull request in GitHub?
- Is it possible to identify merge commits that had conflicts after the fact?
- git merge: apply changes to code that moved to a different file
- How does git handle squash merge vs normal merge?
- Merge tracking for Git cherry picking?
- Re-doing a reverted merge in Git
- Resolve Git merge conflicts in favor of their changes during a pull
- How to merge specific files from Git branches
- How to keep a branch synchronized/updated with master?
- Duplicate commits after using git filter-repo and merging
- git pull VS git pull --no-rebase
- How can I deal with this Git warning? "Pulling without specifying how to reconcile divergent branches is discouraged"
- What's the difference between 'git merge' and 'git rebase'?
- Merging master into feature branch with conflict resolution
- Git: How to convert an existing `merge` to a `merge --squash`?
- "refusing to update ref with bad name" when using `git rebase --rebase-merges`
- Plumbing way to do no-fast-forward merge
- Have Git Select Local Version On Merge Conflict on a Specific File?
- Git says up to date although changes were made remotely