3 ms·
Agreed, I used to interactively rebase but have since switched to a four step process. If you have conflicts, you'll deal with them all at once when you merge i
by derenge 6y ago
Agreed, I used to interactively rebase but have since switched to a four step process. If you have conflicts, you'll deal with them all at once when you merge in `origin/master`.
git fetch
git merge origin/master
git reset origin/master
git commit