Hacker News new | ask | show | jobs
by flobosg 1401 days ago
I have a git branch where I apply my patches. If the master branch is updated I pull their upstream changes and then rebase my commits on top of theirs [1]. Once in a while conflicts may arise, but they’re usually solved easily.

[1]: https://dwm.suckless.org/customisation/patches_in_git/