How I keep class repo forks sane
Published:
If you have ever forked a professor’s repo, pushed your own work, then pulled their new commits and hit a wall of merge conflicts, you are not alone. The fix is simple: wire your remotes correctly and rebase instead of merging.
