Git and GitHub Workflow | 5th Issue Ticket Task | Git Command Line

[Ifycode]

Prerequisite

Ensure that you have completed tasks 1 - 4 of the Git & GitHub Workflow "Good First Issue" Tickets. If you have not done or completed the Git and GitHub tickets, you can find it through the project board here: git and github workflow good first issue tickets

If your pull requests for all the previous tasks have been submitted and approved by a maintainer, you can proceed to do this 5th task.

Helpful resource (git command line)

Wiki - Syncing your fork with the original repo using git command line: https://github.com/collabo-community/good-first-issue-solutions/wiki/GIT-&-GITHUB-%7C-Syncing-your-fork-with-the-original-repo-using-git-command-line

Issue description

In this 5th task assignment, you are required to make some changes to the markdown tutorial file that you created in the 4th task. using command line git. It will also involve learning two things: how to sync your fork using command line and how to merge conflicts using command line. Find more information in the expected solution section below.

Expected solution

Tip

Stick to the branch naming convention you have been using.

• Use git command line to first sync your fork's develop branch with the @collabo-community repo's develop branch, so that your previous tasks' changes that we merged into our develop branch can reflect in your fork's develop branch. Make a screenshot of the successful sync that you did via command-line. You will need it for your pull request, to show proof that you used command line git.
• In the gitcollab-cmd-task.md file that you previously created (in the 4th task), change this line:

- Inline Code Block: `This code block text will show up inline`.

To this instead:

- Inline Code Block (with non-code text): `This code block text will show up inline.` This part of the text is just ordinary text!

• Once you are done, request for review as usual. We will guide you to know when a conflict has occurred in your pull request, and steps to fixing it (using the command line this time around).

Additional context

• Let us know in the comment of this issue ticket (GitHub discussion) that you will be participating in this 3rd task assignment. Ensure to tag @collabo-community/maintainers in your comment. That way, maintainers will be notified and will be prepared to help review your pull request when you submit.
• Repo URL (where you are to do and submit this task to): https://github.com/collabo-community/good-first-issue-solutions
• If you have any questions or need any clarification when working on this ticket, please use the #good-first-issue-support channel in our discord community server.
• To help you understand how to work with other contributors within the @collabo-community better, we will review your pull request based on the directions given in this issue ticket and our Public Documentation Resource Guide.

Testing checklist

Note (to contributor taking on this task assignment): Add the testing checklist below (without this note) to your pull request when submitting your fix. This will guide (you and) the contributors who will review your fix to know what is important to check or test for.

• Here's a link to my approved 4th task pull request: Replace this inline code block with the link to your approved 4th task pull request
• My branch for this task assignment is created from the develop branch, and the name of my branch is a mix of @GH- and the ticket's issue number (no # sign and no space in there).
• I have updated the gitcollab-cmd-task.md file in my own folder, as directed in the 5th issue ticket task.
• I have taken a screenshot to show that I used git command line to sync my fork, as specified in the issue ticket. I have added the screenshot to the screenshot section of my pull request's body description.
• I certify that I ran my checklist.

[Goodnews-code]

Hi @collabo-community/maintainers, i will be participating in this 5th task.

[Ifycode]

👍🏼