Timeline for Is my company merging branches wrong?
Current License: CC BY-SA 4.0
26 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Jun 6, 2019 at 12:00 | history | tweeted | twitter.com/StackSoftEng/status/1136603890391162881 | ||
| May 18, 2019 at 12:53 | comment | added | spender | An equally serious problem emerges from between the lines of your question... "Big bang merge" implies "big bang releases", a wonderful way of making the product difficult to test, every (infrequent) release proving to be a "hold-your-breath" moment, where management start to get shifty if you book time off work at or around the big release day. Continuous integration done right reduces this risk to the point where deployments on friday afternoon are a happy thing. I'd also steer towards a more modern SCM (such as git). Merges in Subversion are so much more likely to cause serious pain. | |
| May 17, 2019 at 20:34 | comment | added | user6567423 | @Polygnome I think the company is at it's limits for now :) But I think I may be entering the role of second gatekeeper sometime in the future. I think the limits are well known by the management, I was just looking for potential solutions to help them. | |
| May 17, 2019 at 19:05 | comment | added | Polygnome | @user6567423 Have you talked about your boss about hiring more people to get merges done faster? You can't solve missing manpower with software engineering. | |
| May 17, 2019 at 18:21 | comment | added | user6567423 | @Gregory Nisbet - Depending on how much work was required when they were thrown back, small changes not really, big design changes yes, but we try to avoid those big design changes. | |
| May 17, 2019 at 18:21 | comment | added | user6567423 | @Liath - We wait till he gets back hahaha, usually we are given larger projects that will carry through till he is back. | |
| May 17, 2019 at 18:19 | comment | added | user6567423 | @Polygnome - I believe it is because he has too much on his plate and must juggle several other jobs. | |
| May 17, 2019 at 16:19 | comment | added | Greg Nisbet | Do the changes that are thrown back because of conflicts but not other defects need to go through the approval process again once the conflicts are resolved or are they considered "provisionally approved"? | |
| May 17, 2019 at 15:04 | comment | added | Braiam | How would you define the linux kernel branching/merge strategy? | |
| May 17, 2019 at 13:28 | comment | added | Liath | What happens when the boss goes on holiday? | |
| May 17, 2019 at 11:14 | comment | added | MechMK1 | I was in a similar position as you, several times. I can tell from personal experience that many companies do version control, especially branching, horribly wrong. | |
| May 17, 2019 at 9:38 | answer | added | Borjab | timeline score: 8 | |
| S May 17, 2019 at 6:03 | history | suggested | muru | CC BY-SA 4.0 |
quote formatted quoted text, added article title to link
|
| May 17, 2019 at 5:12 | answer | added | Martin Maat | timeline score: 0 | |
| May 17, 2019 at 4:42 | comment | added | Polygnome | Why is merging deferred? Usually, there is a reason for not doing it immediately. is the single guy overworked and the backlog just gets so big? is there some other reason why merging isn't done in a timely manner? | |
| May 17, 2019 at 1:59 | review | Suggested edits | |||
| S May 17, 2019 at 6:03 | |||||
| May 17, 2019 at 0:28 | answer | added | bmm6o | timeline score: 2 | |
| May 16, 2019 at 23:19 | vote | accept | user6567423 | ||
| May 16, 2019 at 22:13 | history | became hot network question | |||
| May 16, 2019 at 21:27 | answer | added | Doc Brown | timeline score: 61 | |
| May 16, 2019 at 20:17 | answer | added | Karl Bielefeldt | timeline score: 13 | |
| May 16, 2019 at 20:10 | review | Close votes | |||
| May 21, 2019 at 3:05 | |||||
| May 16, 2019 at 19:36 | history | edited | user6567423 | CC BY-SA 4.0 |
added 361 characters in body
|
| May 16, 2019 at 19:36 | answer | added | gnasher729 | timeline score: 1 | |
| May 16, 2019 at 19:31 | answer | added | Matthew | timeline score: 18 | |
| May 16, 2019 at 18:52 | history | asked | user6567423 | CC BY-SA 4.0 |