4 ms·
Never have rebased. Get some updates, then merge master branch. Seems to be pretty straightforward to me. git fetch -p --all git pull git merge master
by otteromkram 3y ago
Never have rebased.
Get some updates, then merge master branch. Seems to be pretty straightforward to me.
git fetch -p --all
git pull
git merge master
(Handle merge conflicts in WE of choice.)
git push
Boom. I'll let the CI platform squash commits post-merge.
Option for gitlab if it's a small change and you don't want to run a full suite of tests.
git push -o ci.skip