Too quiet, .. how about a question for the git folks?

[L. V. Lammert]

Wrestling with a way to merge a significant change with a production
repo, .. currently have:

* Production repo that is behind the running code

* Developer repo that has changes for about 20% of those files

Trying to figure way to add the branch from the developer repo to that
testing branch in the production repo, so we can checkout that branch for
testing.

Suggestions would be appreciated!

Lee

[Steven Pritchard]

If I understand what you're trying to do, depending on what the history looks like, you might be able to do this cleanly:

git checkout developer_branch # Switch to the developer's branch

git checkout -b testing_branch # Create a new branch to test the merge

git rebase production_branch # Stash the developer's branch changes, apply production branch changes since they diverged, and re-apply the developer's branch

If that isn't clean enough to sort out, go the other direction with a merge commit.

git checkout production_branch # Switch to the production branch

git checkout -b testing_branch # Create a new branch to test the merge

git merge developer_branch # Let git figure out how to merge in the changes from the developer's branch