Skip to content

Commit e297a4b

Browse files
update mi-faq.md (fixes #3502) (#3508)
1 parent 823d881 commit e297a4b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pages/mi/mi-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ It's easy to lose sight of the ‘Big Picture’ when focused on individual task
204204
- [GitHub & Git Foundations (Playlist)](https://www.youtube.com/watch?list=PLg7s6cbtAD15G8lNyoaYDuKZSKyJrgwB-&v=FyfwLX4HAxM)
205205
- [Shorter Git/GitHub Tutorial (Playlist)](https://www.youtube.com/watch?v=vR-y_2zWrIE&list=PLWKjhJtqVAbkFiqHnNaxpOPhh9tSWMXIF)
206206
- [Mastering Markdown (Playlist)](https://www.youtube.com/watch?v=Je5w18nn-e8&list=PLu8EoSxDXHP7v7K5nZSMo9XWidbJ_Bns3)
207-
- [How to Manually Fix Git Merge Conflicts](https://www.youtube.com/watch?v=g8BRcB9NLp4) - Please note that this video will explain how to fix a merge conflict from the point of view of the repo owner who is trying to merge a pull request. However, it is helpful also when you have to fix a merge conflict on your own local and forked repos.
207+
- [How to Manually Fix Git Merge Conflicts](https://www.youtube.com/watch?v=g8BRcB9NLp4) - Please note that this video will explain how to fix a merge conflict from the perspective of the repository owner who is trying to merge a pull request. However, it is also helpful when you need to resolve a merge conflict in your own local and forked repositories.
208208
- [How to Use VirtualBox](https://www.youtube.com/watch?v=Dbblu_HVROk)
209209
- [Vagrant Tutorial](https://www.youtube.com/watch?v=PmOMc4zfCSw)
210210

0 commit comments

Comments
 (0)