Timeline for Whose responsibility is it to fix merge conflicts?
Current License: CC BY-SA 4.0
4 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Feb 24, 2020 at 17:45 | comment | added | adelphus | I think this is a given. The question is more to do with who fixes the conflicts. Does A do it (because it's their branch) or does B do it (because their merge to master created the conflicts). | |
| Feb 24, 2020 at 12:59 | comment | added | pjc50 | In git workflows, it's often better to rebase a local branch rather than merge. This shouldn't be done if the branch has been pushed anywhere though. | |
| Feb 23, 2020 at 21:10 | review | First posts | |||
| Feb 24, 2020 at 14:04 | |||||
| Feb 23, 2020 at 21:08 | history | answered | knallfrosch | CC BY-SA 4.0 |