|
|
|
|
|
by dustfinger
979 days ago
|
|
> You think merging/rebasing/resolving conflicts is a pain now? Doing the same thing via email was _so_ much worse. Email is just used to receive the patch, you should use a tool meant for the job to actually do the merge. I realize that is probably not what you meant though. Besides, when email patching first began, the tooling was in its infancy. However; today tools like the git cli itself, or magit + smerge-mode (my personal preference) are as good as GitHub, if not better. I never actually use GitHub for merging, even when working on projects hosted in GitHub. |
|