# Github branching strategy

**URL:** <https://forums.unrealengine.com/t/github-branching-strategy/122424>\
**Category:** C++\
**Tags:** unreal-engine, GitHub\
**Created:** [February 14, 2019, 11:33pm UTC](https://forums.unrealengine.com/t/github-branching-strategy/122424 "2019-02-14T23:33:02Z")\
**Posts on this page:** 1\
**Page:** 1

<div class="post-metadata">

**Author:** ![simco50](https://d3kjluh73b9h9o.cloudfront.net/original/4X/2/8/5/28502927f1d97ba1051b3b47ccfe17233bf41ef0.png) [@simco50](https://forums.unrealengine.com/u/simco50)\
**Post date:** [February 14, 2019, 11:33pm UTC](https://forums.unrealengine.com/t/github-branching-strategy/122424/1 "2019-02-14T23:33:02Z")

</div>

Hi,

This might be documented somewhere but I haven’t been able to find a good answer to it.  
I was looking at the 4.22 branch on Github and I was wondering what it would take to merge that into my 4.21 branch.  
When doing a quick merge to just check the possible conflicts, I noticed it chose a commit from 5 months ago as the base instead of the final 4.21.2 release commit.  
After taking a closer look, I noticed that at some point, changes that were being made in the 4.21 branch were being \*\*redone \*\*in the 4.22 branch instead of being merged which becomes quite problematic for Git.  
Has it always been like this? Is this a side-effect of Epic using Perforce on their end?  
How have people been going around this?

Thanks!  
Simon
