Getting Started with Git

10 / 16
Previous Index Next  

GitHub Project - Getting Started with Git - Merging branches

You can merge the changes you made in one branch into another branch. You also need to resolve any conflicts if they arise.

INSTRUCTIONS
  • Make sure you are in ~/devops directory
  • If you are not on the master branch then checkout to master branch using git checkout master command
  • Check the content of helloworld.py file using cat helloworld.py command
  • Merge feature_a branch into master branch using git merge <branch_name> command
  • Check the content of helloworld.py file again
Get Hint See Answer


Note - Having trouble with the assessment engine? Follow the steps listed here

Previous Index Next  

Loading comments...