Here&#39;s a workflow that I commonly deal with at work.

    git checkout -b feature_branch
    # Do some development
    git add .
    git commit
    git push origin feature_branch

At this point the feature branch is up for review from my colleagues, but I want to keep developing on other features that are dependent on `feature_branch`.  So while `feature_branch` is in review...

    git checkout feature_branch
    git checkout -b dependent_branch
    # Do some more development
    git add .
    git commit

Now I make some changes in response to the code review on feature_branch

    git checkout feature_branch
    # Do review fixes
    git add .
    git commit
    git checkout dependent_branch
    git merge feature_branch

Now this is where we get have problems.  We have a squash policy on master, which means that feature branches that are merged into master have to be squashed into a single commit.

    git checkout feature_branch
    git log # Look for hash at beginning of branch
    git rebase -i  first_hash_of_branch # Squash feature_branch into a single commit
    git merge master

Everything is cool, except with `dependent_branch`. When I try to rebase dependent branch onto master or try and merge master into it, git is confused by the re-written/squashed history and basically marks every single change in `depedendent_branch` as a conflict.  It&#39;s a PITA to go through and basically re-do or de-conflicticize all of the changes in `dependent_branch`. Is there some solution to this?  Sometimes, I&#39;ll manually create a patch and apply it off a fresh branch of master, but if there&#39;s any real conflicts with that, its even worse to fix.

    git checkout dependent_branch
    git diff &gt; ~/Desktop/dependent_branch.diff
    git checkout master
    git checkout -b new_dependent_branch
    patch -p1 &lt; ~/Desktop/dependent_branch.diff
    # Pray for a clean apply.

Any ideas?  I know this happens because of the re-written history during the squash, but that&#39;s a requirement that I can&#39;t change.  What&#39;s the best solution / workaround?  Is there some magic I can do?  Or is there a faster way to do all the steps involved with manually creating the diff?
    
    

All Arcanist Solutions on Gang of Coders

Total of 1 Arcanist Solutions

Merging a branch of a branch after first branch is squashed when merged to master