If you want to merge changes from the master branch into the development branch and push those changes, follow these steps:
Step-by-Step Instructions:
- Switch to the
developmentBranch
Use the following command to move to thedevelopmentbranch:git checkout development - Merge
masterIntodevelopment
Merge the changes from themasterbranch intodevelopment:git merge master - Push the Updated
developmentBranch to Remote
After merging, push the updateddevelopmentbranch to your remote repository:git push origin development
Combined Command:
To execute all the above steps in one line, you can run:
git checkout development && git merge master && git push origin development
Notes:
If you encounter merge conflicts, resolve them before pushing the changes.
Ensure you have committed and pushed all your changes on master before merging.