Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix: Git and GitHub Collabo | 2nd Issue Ticket Task | Working with GitHub web UI #8

Merged
merged 4 commits into from
Jan 27, 2025
Merged

Fix: Git and GitHub Collabo | 2nd Issue Ticket Task | Working with GitHub web UI #8

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed9ed29
Update gitcollab-ui-task.md
BA-atomic Jan 21, 2025
16b40c4
Merge branch 'develop' into @GH-3
BA-atomic Jan 25, 2025
dce308a
Update gitcollab-ui-task.md
BA-atomic Jan 27, 2025
ae197d6
Update gitcollab-ui-task.md
BA-atomic Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion @BA-atomic/gitcollab-ui-task.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`. Do you notice the difference?
- Inline Code Block (with non-code text): `This code block text will show up inline`. This part of the text is just ordinary text.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Screenshot 2025-01-25 at 03 18 08

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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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.

- Bold text: **This text will show up as a Bold Text**
- Code Block:
````
Expand Down