2 ms·
> Never merge with GitHub! While I agree with the spirit of this comment, in practice I do this: 1. Update: git pull --rebase 2. Clean up my commits:
by khalilravanna 6y ago
> Never merge with GitHub!
While I agree with the spirit of this comment, in practice I do this:
1. Update:
git pull --rebase
2. Clean up my commits:
git rebase -i HEAD~X
3. Push:
git push origin BRANCH -f
4. Merge in GitHub
Works pretty well for me. That being said, I would love to be able to take care of 2 and 3 within GitHub for branches that are already updated to the parent branch.