Exercise

Make a new repository on your local system.
Make a branch with the name “development”.
Switch to the new branch.
Make a new file with the name “README” and contents “HELLO WORLD”.
Commit the “README” file.
Make a new repository on Github.
Add the new repository on Github as a remote with the name “origin” in your local repository.
Push your “development” branch to the Github remote.
Make a new branch with the name “feature/hello-world”.
Switch to the new branch.
Edit the “README” file, changing “HELLO WORLD” to “HELLO FEATURE WORLD”.
Commit the README file. (Don’t push)
Switch to the “development” branch.
Edit the “README” file, changing “HELLO WORLD” to “HELLO DEVELOPMENT WORLD”.
Commit the “README” file.
Push the changes on the “development” branch to the Github remote.
Switch to the “feature/hello-world” branch.
Push the branch to the Github remote.
Create a “Pull Request” to merge the “feature/hello-world” into “development”.
Resolve the conflict in such a way that both changes are integrated.
Merge the “feature/hello-world” branch into “development” using the “Pull Request” on Github.
Create a new branch based on the “development” branch. The name should be: “release/0.0.1”.
Edit the “README” file, changing the text into “HELLO GITT”.
Commit and push the change.
Make a new “Pull Request” on Github, with the intent to merge “release/0.0.1” into “master”.
Make a new “Pull Request” on Github, with the intent to merge “release/0.0.1” into “development”.
Merge both “Pull Requests” to their respective destination branch.
Switch to the “master” branch.
Pull in the latest changes from the “master” branch on the remote.
Tag the last commit. The tag should be “0.0.1”.
Push the “master” branch to the Github remote, the tag should be pushed too.
Create a new branch based on the tag “0.0.1”. The name should be “hotfix/correct-readme-text”.
Switch to the new branch.
Edit the “README” file, changing “HELLO GITT” to “HELLO GIT WORLD”.
Commit and push the change.
Make a “Pull Request” with the intent to merge the branch “hotfix/correct-readme-text” into “master”.
Make a “Pull Request” with the intent to merge the branch “hotfix/correct-readme-text” into “development”.
Merge the branches using the “Pull Requests” on Github.
Switch to the “master” branch.
Pull in the latest changes from the Github remote.
Tag the last commit increasing the version to “0.0.2”.
Push the “master” branch to the Github remote.

Report abuse