Changes
Page history
Documentation update
authored
Aug 27, 2024
by
Shuvra S. Bhattacharyya
Show whitespace changes
Inline
Side-by-side
instructional/Git-Resources.md
View page @
7dc2b6dd
...
...
@@ -3,6 +3,5 @@ Some resources that provide useful background and reference material for learnin
*
[
An introductory Tutorial
](
https://git-lectures.github.io/
)
*
[
Resolving merge
* conflicts
](
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line
)
*
[
Resolving merge conflicts
](
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line
)