A branch landing is the process of cherry-picking a range of commits from a source branch to a destination branch. This may be required to merge changes from a development branch onto a production branch, or to merge changes from one production branch to another. Here are the steps required.
- Check out the source branch
git checkout <Branch1> - Determine the starting and ending commit SHA that you would like to land
git log –pretty=oneline - Check out the destination branch
git checkout <Branch2> - Cherry pick the range of commits
git cherry-pick <StartSHA>..<EndSHA> - Resolve any merge conflicts and commit the change
View unmerged files: git ls-files -u - Resume the cherry pick process
git cherry-pick –continue