Timeline for Are Frequent Complicated Merge Conflicts A Sign of Problems?
Current License: CC BY-SA 3.0
7 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Dec 29, 2019 at 11:38 | comment | added | Vorac | @DaveInCaz of course conflicts don't magically disappear. As far as I understand it, rebasing solves conflicts per-commit while merging solves conflicts per-branch. | |
| Dec 29, 2019 at 2:54 | comment | added | StayOnTarget | Won't you just get conflicts during the rebase instead of during a merge? Its the same conflict either way. | |
| Aug 23, 2013 at 16:48 | audit | First posts | |||
| Aug 23, 2013 at 16:50 | |||||
| Aug 20, 2013 at 10:51 | history | edited | Vorac | CC BY-SA 3.0 |
added 89 characters in body
|
| Aug 16, 2013 at 17:22 | comment | added | Vorac | @joshy this is true. Only the middle paragraph kind of address your question. But here is a direct answer. If merging is frequent and difficult, then this is certainly an indication of problematic workflow/communication problem/architecture problem/division or the roles problem. | |
| Aug 16, 2013 at 15:54 | comment | added | joshin4colours | Great description of a good Git workflow, but this doesn't quite answer my question. | |
| Aug 16, 2013 at 15:41 | history | answered | Vorac | CC BY-SA 3.0 |