This repository was archived by the owner on Apr 28, 2025. It is now read-only.
Add git-merge and slide on merge conflics #189
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Author
|
Ironically this will likely create a Merge Conflict with the mermaid diagrams Branch... |
Member
Author
|
@htriem @mocdaniel Feedback is welcome |
theFeu
suggested changes
Jan 12, 2023
Collaborator
theFeu
left a comment
theFeu
left a comment
There was a problem hiding this comment.
I would add this info to the file :)
- day1: Adds a new Lab in git branch section with a git merge - day2: Adds a Slide explaining Merge Conflics before we simulate one
martialblog
force-pushed
the
extend-git-merge
branch
from
0d08f4c to
15b1936
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #99