Fix: Git and GitHub Collabo | 2nd Issue Ticket Task | Working with GitHub web UI #8
Conversation
|
@collabo-community/maintainers, this PR is ready for review |
|
@BA-atomic Nice work so far. |
Akpjunior94
requested review from
Akpjunior94
and removed request for
Akpjunior94
|
@collabo-community/maintainers, the link to the first task has been updated and this PR is ready for review |
|
Thank you @Akpjunior94 |
There was a problem hiding this comment.
@BA-atomic Please fix this - also apply the markdown for the testing checklist. Not everything in there was written as plain text.
|
@collabo-community/maintainers, the testing checklist has been edited and this PR is ready for review |
|
Cool 😃, You are doing well @BA-atomic Wait for my next comment to direct you. I will purposely create a conflict situation so that you can have the experience of how to merge a conflict. |
@BA-atomic/gitcollab-ui-task.md
Outdated
| @@ -6,7 +6,7 @@ Hi, I'm @BA-atomic. I'm currently learning to collaborate with Git and GitHub. I | |||
|
|
|||
| Unordered list used for listing markdown examples below: | |||
| - Link: [This link text will take you to Collabo Community's Github Page when you click on it!](https://github.com/collabo-community) | |||
| - Inline Code Block: `This code block text will show up inline`. | |||
| - Inline Code Block (with non-code text): `This code block text will show up inline`. This part of the text is just ordinary text. | |||
There was a problem hiding this comment.
Here's the next step that concerns conflict resolution @BA-atomic
How to know that a conflict has occurred - Look towards the bottom of this pull request, you will this text on the UI: "This branch has conflicts that must be resolved". Also notice that the file you last made changes to was mentioned - That is where the conflict took place.
Screenshot
What caused the conflict? - Someone (me 😉), who still had the version of the file that contains the old content (Inline Code Block: This code block text will show up inline.), made changes to that same line so that it now says: Inline Code Block: This code block text will show up inline. Do you notice the difference?.
Guess what? Maintainers of this repo already added/merged the above change into the original Collabo Community repo's develop branch!
You on the other hand, have also made changes to the same line of the same file. The content that both of you added at the end of that line are totally different. You also added new content somewhere within the line, that the other person did not have before it was merged.
In summary, both of you who made changes to that same line are not in agreement i.e. there's a "conflict".
What to do next?
Here is the correct content that should be on the "Inline Code Block (with non-code text)" line:
- Inline Code Block (with non-code text): `This code block text will show up inline.` This part of the text is just ordinary text! Do you notice the difference?
- Click on the "Resolve conflicts" button. Use the content of the code block above to adjust the "Inline Code Block (with non-code text)" line, in the editor that opens up; so that the line contains a mix of your change and their own change.
- And then click on "Mark as resolved".
- Request for review as usual, once you are done. If you get lost or need help at any point, get help on the appropriate channel in our discord community.
There was a problem hiding this comment.
@BA-atomic what you added is not correct check the What to do next? section of the conflict resolution instructions given, to see was you missed.
|
@collabo-community/maintainers, I have resolved the conflicts and this PR is ready for review |
@BA-atomic/gitcollab-ui-task.md
Outdated
| @@ -6,7 +6,7 @@ Hi, I'm @BA-atomic. I'm currently learning to collaborate with Git and GitHub. I | |||
|
|
|||
| Unordered list used for listing markdown examples below: | |||
| - Link: [This link text will take you to Collabo Community's Github Page when you click on it!](https://github.com/collabo-community) | |||
| - Inline Code Block: `This code block text will show up inline`. | |||
| - Inline Code Block (with non-code text): `This code block text will show up inline`. This part of the text is just ordinary text. | |||
There was a problem hiding this comment.
@BA-atomic what you added is not correct check the What to do next? section of the conflict resolution instructions given, to see was you missed.
|
@collabo-community/maintainers, I have resolved it and this PR is ready for review |
@BA-atomic/gitcollab-ui-task.md
Outdated
| @@ -6,7 +6,7 @@ Hi, I'm @BA-atomic. I'm currently learning to collaborate with Git and GitHub. I | |||
|
|
|||
| Unordered list used for listing markdown examples below: | |||
| - Link: [This link text will take you to Collabo Community's Github Page when you click on it!](https://github.com/collabo-community) | |||
| - Inline Code Block (with non-code text): `This code block text will show up inline`. This part of the text is just ordinary text. | |||
| - Inline Code Block (with non-code text): `This code block text will show up inline.` This part of the text is just ordinary text! Do you notice the difference? | |||
There was a problem hiding this comment.
@BA-atomic "the text will show up inline" part the full stop is supposed to be after the backtick, not before.
|
@collabo-community/maintainers, I have resolved it and this PR is ready for review |
There was a problem hiding this comment.
Hurray! Nicely done. well done @BA-atomic 🙌🏽
Agba doings 💪🏽
See you in the next task 🎉
This pull request makes the following changes
General checklist
Testing checklist
developbranch, and the name of my branch is a mix of@GH-and the ticket's issue number (no # sign and no space in there).gitcollab-ui-task.mdfile in my own folder, as directed in the 2nd issue ticket task.Screenshot
Pull request guideline extension
Note
Do not remove this note and the sections below. This talks about extra things to take note of, in addition to the directions given in the Collabo Community pull request guidelines.
We appreciate the time taken to help tackle issue tickets within the Collabo Community. Please go ahead to submit your pull request even if it is not yet completed, and push to the pull request actively. This will allow us to know that you have not abandoned the issue ticket. However, you should only alert reviewers about your pull request as explained below, to avoid flooding their GitHub notifications unnecessarily.
"Ready for review" implies that things are working as expected, according to how it is specified in the issue ticket you are working on. Ensure that you test the code that you are working on, that it works as expected. Don't just request for review when your pull request is not yet done and working.
The only time you should be making people review something incomplete is: if you want to show them what's not working, so that they can send help or guidance. If this is the case, be explicit about this in our Discord community or in the comment of your pull request (after you have submitted the pull request).
Requesting review: For this repository, the review team to request review from is the
@collabo-community/maintainersteam. Once your pull request is ready for review, select this review team from the reviewers dropdown on this pull request. If you don't have access to the reviewer's dropdown, tag this review team in the comment of this pull request.