# Reworking Git Branches with git filter-branch

DevFeed: [Reworking Git Branches with git filter-branch](<https://devfeed.tech/articles/reworking-git-branches-with-git-filter-branch-18866.md>)

Original publisher: [Read original article](<https://www.morling.dev/blog/reworking-git-branches-with-git-filter-branch/>)

Published: 2020-03-15T23:00:10Z

Content type: tutorial

Language: en

Sources: [Gunnar Morling](<https://devfeed.tech/sources/gunnar-morling.md>)

Topics: [Git](<https://devfeed.tech/topics/git.md>), [Documentation](<https://devfeed.tech/topics/documentation.md>), [Development](<https://devfeed.tech/topics/development.md>)

Tags: [bugfixes](<https://devfeed.tech/tags/bugfixes.md>), [development](<https://devfeed.tech/tags/development.md>), [documentation](<https://devfeed.tech/tags/documentation.md>), [git](<https://devfeed.tech/tags/git.md>), [merge](<https://devfeed.tech/tags/merge.md>)

## AI overview

The article describes a difficult Debezium documentation merge conflict caused by divergent Git branch structures and partially backported changes. It introduces the problem and the plan to reapply relevant documentation changes to the maintained branch.

## Source excerpt

Table of Contents The Problem The Solution Within Debezium, the project I'm working on at Red Hat, we recently encountered an "interesting" situation where we had to resolve a rather difficult merge conflict. As others where interested in how we addressed the issue, and also for our own future reference, I'm going to give a quick run down of the problem we encountered and how we solved it.