Hint Challenge 1 (try it your self first before open this hint)
Create a new branch from the main branch e.g. maithai-feature
git branch maithai-feature
Checkout to the new branch
git checkout maithai-feature
Edit the CONTRIBUTORS.md file by adding your name to the Contributors section
Commit the changes
git add CONTRIBUTORS.md
git commit -m "Add my name to the Contributors section"
Checkout to the main branch
git checkout main
Merge the new branch to the main branch
git merge maithai-feature --no-ff
Push the changes to the remote repository at main branch
git push origin main
Challenge 2: Three-Way Merge Practice by using Pull Request
Guide:
Create a new branch from the main branch e.g. monkan-feature
Checkout to the new branch
Edit the CONTRIBUTORS.md file by adding your name to the Contributors section
Commit the changes
Push the changes to the remote repository at the new branch
Create a Pull Request from the new branch to the main branch
Merge the Pull Request
Pull the changes from the remote repository at the main branch
Verify by using git log --graph --oneline. You should see the commit history like below:
* commit E (HEAD -> main, origin/main): Merge pull request #1 from <your-github-username>/monkan-feature|\
|* commit C (monkan-feature): Implement feature Monkan
|/
* commit C (main): Merge branch 'maithai-feature'|\
|* commit B (maithai-feature): Implement feature Maithai
|/
* commit A: Initial project setup
Hint Challenge 2 (try it your self first before open this hint)
Create a new branch from the main branch e.g. monkan-feature
git branch monkan-feature
Checkout to the new branch
git checkout monkan-feature
Edit the CONTRIBUTORS.md file by adding your name to the Contributors section
Commit the changes
git add CONTRIBUTORS.md
git commit -m "Add my name to the Contributors section"
Push the changes to the remote repository at the new branch
git push origin monkan-feature
Create a Pull Request from the new branch to the main branch
Merge the Pull Request
Pull the changes from the remote repository at the main branch
git pull origin main
Challenge 3: Feature Toggle
Guide:
Checkout to the main branch
Go to challenge3 directory cd challenge3 directory
make run or javac Main.java then java Main to verify the result. You should see Sending via SMS.
Email notification feature toggle is DISABLED
Sending SMS to 0812345678: Hello, Java!
Enable the Email feature by changing the featureToggle.setEmailNotificationEnabled to true
Verify the result make sure the email notification is sent to the email address that you specified by using make run then see the result.
Commit the changes on the main branch
Push the changes to the remote repository at the main branch
verify by using make run. You should see the email notification is sent to the email address that you specified
Email notification feature toggle is ENABLED
Sending email to [email protected]: Hello, Java!
Hint Challenge 3 (try it your self first before open this hint)
Checkout to the main branch
git checkout main
Go to challenge3 directory cd challenge3 directory
Enable the feature by changing the featureToggle.setEmailNotificationEnabled to true
Verify the result make sure the email notification is sent to the email address that you specified