![]() To merge the releaseBranchName release branch into the master branch that is currently checked out, enter the following command on the command line: git merge releaseBranchNameĪfter the new feature test, create a new Mobify bundle from the feature release branch.įollow the steps in the Create a New Bundle tutorial. To go back to the master branch, enter the following command on the command line: git checkout masterĩ. When you are ready, merge the release branch into master.Ĩ. Use the same test procedures as for the individual branches. Test the release branch to ensure that the merge steps did not introduce problems. If you are done with the first and second feature branches, delete them with the commands: git branch -d featureBranchName1 Your release branch now has all of the commits of the first and second feature branch.ħ. To merge the featureBranchName2 second feature branch into the current release branch, enter the following command on the command line: git merge featureBranchName2 Now, merge the second feature branch into the feature release branch.Ħ. To merge the featureBranchName1 branch into the current branch, enter the following command on the command line: git merge featureBranchName1 ![]() Now, merge the first feature branch into the release branch.ĥ. To create the release branch in Git, enter the following command on the command line: git checkout -b releaseBranchName If you are already on the master branch, skip ahead to create the release branch. If your current branch is not master, continue with the next step. Examine the output for the currently checked out branch. ![]() ![]() Read about the Git merge command in the official Git merge documentation page.Ģ. The Git merge command uses the current branch as the branch into which changes from another branch are merged into. The branch successively merges the changes from the first branch and the second branch. This release branch is a new branch off master. Once both features pass QA, merge the two branches into a single release branch. Merge the First and Second Feature Branches into a Release Branch Test the second feature branch with the same procedure as for the first branch. To create a second feature branch in Git, enter the following command on the command line: git checkout -b featureBranchName2 Keep distinct feature development separate even as you develop multiple project features in parallel.Ĥ. To change to the master branch it Git, enter the following command on the command line: git checkout master If your current branch is not master, continue to the next step.ģ. To check which branch you are currently on, enter the following command on the command line: git branchĢ. Develop a Second Feature in a Git Branch off MasterĬreate a second feature branch off master.ġ. Preview your local server on test devices.įollow the tutorials Preview a Local Adaptive.js Site on a Device or Preview a Local Server on your Computer to start to preview. When you finish development, your QA tests the branch. As you work, ensure that there are no linting errors: grunt lint To commit the work in this feature branch, frequently enter the following commands on the command line: git add -Aĥ. To create a new Git branch off master, enter the following commands on the command line: git checkout masterįor a complete tutorial on Git branches, see the Using Branches tutorial from the Getting Git Right documentation set.Ĥ. To change to your local Git project repository, enter the following command on the command line: cd path/to/github/directoryģ. Open a new Terminal (Mac) or Command Prompt (Windows).Ģ. The new branch is created from the master base by default.ġ. To develop new features in your project, create a new feature branch in Git. Develop a new Feature in a Git Branch off the Master Base Test those branches for functionality before you merge them into the master version of your project.ġ. Use Git to work on new features of your mobile site in branches. Git is an open-source tool that allows you to control different versions of components in your project. Use this workflow in your mobile site development. Organize your Development Workflow with Git
0 Comments
Leave a Reply. |