Timeline for Whose responsibility is it to fix merge conflicts?
Current License: CC BY-SA 4.0
5 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Mar 13, 2020 at 22:53 | audit | First posts | |||
| Mar 13, 2020 at 22:53 | |||||
| Feb 24, 2020 at 19:38 | history | edited | Mecki | CC BY-SA 4.0 |
Added a tip and sample for that tip
|
| Feb 24, 2020 at 15:42 | comment | added | Baldrickk | And this is also why you want to keep your features/branches small - any conflicts will likewise be kept small, and easy to manage. | |
| Feb 22, 2020 at 19:17 | comment | added | davidbak | Especially important is the last paragraph: Yes, if the conflict is huge, something went wrong with the planning of the various features/bug fixes/refactorings/whatever that were going on simultaneously. You should have done it differently. (Speaking as one who has failed to do it differently far too many times now ... but maybe, just maybe, I've finally learned that lesson ...) | |
| Feb 22, 2020 at 1:12 | history | answered | Mecki | CC BY-SA 4.0 |