|
|
|
|
|
|
by ItsMonkk
1799 days ago
|
|
|
I'm on a medium sized team so this might not be possible for everyone. The way I resolve this in my Trunk-Based source control system(so we heavily use Feature Flags) is to just never merge. Every person who is to check-in code is to first stash their changes, pull all code, then pop the stash and deal with any conflicts locally, do the relevant testing, then check-in. The entire repo is checkin 1 -> checkin 2 -> checkin 3 -> etc.. When viewed in this light it is no different than if you had pulled the baz() code before you started editing anything. Would you have changed it to bar() or not? |
|
|