3 ms·
Note: if you want to bring upstream changes into your fork, as in [1], use a rebase instead of a merge. Otherwise, you will be fighting with merge commits from
by mcguire 10y ago
Note: if you want to bring upstream changes into your fork, as in [1], use a rebase instead of a merge. Otherwise, you will be fighting with merge commits from now on.
[1] https://help.github.com/articles/syncing-a-fork/ https://help.github.com/articles/syncing-a-fork/