Oct 12, 2021
3 min read
A Git crash course for you — Resolve merge conflicts
In this series of stories, you will deepen your knowledge of git. The following topics will be covered:
- commit files,
- commit changes,
- undo changes,
- resolve merge conflicts,
- find bugs,
- rewriting the history,
- working remotely.
git merge
To download the changes into a separate branch that can be fetched and merged, use the git fetch…
