3 ms·
You are describing classic branch-and-merge. “Here’s my branch that I created offline.” “Sorry, there are merge conflicts, please resolve them before resubmitt
by braythwayt 7y ago
You are describing classic branch-and-merge. “Here’s my branch that I created offline.”
“Sorry, there are merge conflicts, please resolve them before resubmitting,” or, “I resolved them without consulting you.”
- cryptonector 7y agoYes, but I'm saying that that can work very well for a visual, interactive application.