Timeline for How can I properly manage commits, prevent feature conflicts, and manage dependencies with a VCS?
Current License: CC BY-SA 3.0
3 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Oct 12, 2011 at 11:18 | comment | added | Lionel | @marco-dinacci: What you're saying may be correct if you have more than one release being maintained at anyone time. However, you're ignoring the fact that the fixes for those bugs would be merged back into the trunk. The other releases could then pull the changes. Regarding the breaking of the trunk. Before you commit code into the trunk, you're supposed to ensure that you have all the latest source and that your change didn't break the trunk. If it is broken, you should not commit until it's fixed. Of course, there are of course pros and cons to the different approaches. | |
| Oct 12, 2011 at 8:38 | comment | added | Trasplazio Garzuglio | I totally disagree on working on the trunk. If the trunk get broken everybody will be affected. I also disagree on branching after a major release, what if a bug affects two or more releases, you fix it in every branch ? | |
| Oct 12, 2011 at 5:40 | history | answered | Lionel | CC BY-SA 3.0 |