task(git-intro): Fix extra materials

kottans / frontend

:octocat: Kottans frontend course 🎓

https://kottans.org/frontend/

MIT License

1.23k stars 361 forks source link

Closed OleksiyRudenko closed 4 years ago

OleksiyRudenko commented 4 years ago

remove learngitbranching from extras as it is referred to in the main section of the task
add reference guides on merge conflicts