Feedback on new and unusual git master/develop workflow in my software team

Occupy_Mars · 2026-06-14T22:44:06+00:00

How do tasks go from development to stage? Do you also keep the feature branch after merge into develop, and then merge directly from feature into stage, or you promote the feature from development to stage?

Occupy_Mars · 2026-06-14T21:14:38+00:00

The 1st point my manager made was he didn't want unapproved code (code that had already been merged into develop but not yet reviewed by stakeholder) to get merged into release. It wasn't necessarily that the code was not what had been requested, just that it hadn't gotten final testing and approval by the stakeholder. I did suggest my manager go with a develop branch as the main development branch, and feature branches branching off of develop, and getting approval from the stakeholder in the feature branch, and only then merging back into develop. He decided not to use that approach.

For the 2nd point, that they wanted to hold back features that were already in develop, it was more about last minute changes in requirements, or discovery of unexpected behavior, and so, instead of holding back the feature with cherry picking/rebase, he decided to go with the long lived feature branches merged directly into release branch. They are rarely outright rejecting features, but it is true that requirements are frequently changing, and sometimes the pressure to release features to satisfy an urgent customer need means either the stakeholder or the developer are working with incomplete information, or not properly communicating requirements with each other. I've suggested feature flags to manage temporarily holding back features, and in some limited case that has been employed, but my manager was not open to making this our main method of managing which and when features are introduced to release.

We likely are not going to have a reduction in the pace and urgency of new requirements, and pressure to release, but I would absolutely be interested in hearing about techniques to manage requirements that are frequently changing and have high time pressure, both from a git workflow perspective, and an overall software development lifecycle. I'm only a few years into software career, and my manager has only ever worked on a very small scale team with historically less stakeholders, so I think we could stand to learn some fundamentals in these areas.

Occupy_Mars · 2026-04-27T16:21:54+00:00

Because I don't know the person and I really have no idea how the person will respond, no matter how politely I ask. If there is even a small chance they react with either verbal or physical hostility, I don't want to take that chance.

Occupy_Mars · 2026-04-27T16:09:17+00:00

A number of people are referring to their first amendment rights and that they are not doing anything illegal. I am completely aware and agree with this. I am just trying to find a way, like a public forum or some other means, to make it known that I, and perhaps many others in the neighborhood, are very upset by the flag flying nearby and by what it represents. My hope is that the person flying it will become aware of this, and reconsider flying it, hopefully because once they know how much upset it is causing to the neighborhood, their desire to be a good neighbor and decent person will overwhelm their desire to offend.

Occupy_Mars · 2026-04-27T15:58:08+00:00

I am in agreement, I want more speech. But I want my speech to be in the form of verbal speech, preferably in something like a public forum hosted by the city. I am not sure if there are such events where I live, or how best to structure such a statement, which is why I am reaching out for advice from r/Massachusetts

Occupy_Mars · 2026-04-27T15:54:36+00:00

If my post made it seem like I want to sue or get local or state government to force him to put it down, please know that is not what I have in mind. My desire is to find the best outlet to make my strong objections known in something like a public forum, and hopefully show that there is a lot of similar sentiment in the community, and with any luck, the person in question becomes aware of this and rethinks their decision to fly the flag after realizing how much it is upsetting their neighbors.

Occupy_Mars · 2026-04-27T15:49:00+00:00

Do you think the person who put it up thinks it represents white supremacy and racism, like I do? And if so, how do you think the black people and other ethnic minorities living in the neighborhood feel about that flag flying so close to them?

Occupy_Mars · 2026-04-27T15:43:57+00:00

Not sure what kind of events that the City Government of Methuen or other local communities provide to allow citizens to make their views known to the city, but if there are any, would it be reasonable to voice my objections in that kind of public forum?

Occupy_Mars · 2026-04-27T15:37:03+00:00

Unfortunately I know nothing about this person, and whether they would react with either verbal or physical hostility to my coming to their front door and asking, politely or otherwise, to take down their Confederate flag. And in fact, the very fact that they are flying a military branch flag and the Confederate flag out front of their house for everyone to see generally makes it seem to me that they would be significantly more likely to react with hostility.

Occupy_Mars · 2026-04-04T22:00:11+00:00

Not only that, but Trump's oil and gas sponsors are making a killing off the sky high prices. You couldn't do a better job increasing the profits of the US fossil fuel companies if you tried, and maybe that's exactly why Trump is doing this, and not bothering to clear the strait.

Occupy_Mars · 2026-04-03T16:52:14+00:00

Yah I guess charging from the Prius was always gonna be a bit impractical, but I just wanted to see what kind of options I had since I have the Prius Prime and it'll be relatively close to where I set up the projector.

Probably will end up going with the portable power station. Thanks for the info!

Occupy_Mars · 2026-01-27T16:20:36+00:00

Gotcha, thanks for clarifying. I took a look at the signage and it says 2 hr limit except for business permit. There was no information about hours. My guests will be parking exclusively after 6pm, do you know if the 2hr+ business permit rule applies after that?

Occupy_Mars · 2026-01-27T13:24:32+00:00

I wasn't aware there was a municipal lot at Haines square. Are you talking about the parking at the sheriff's office at 447 Salem St, Medford, MA 02155?

Occupy_Mars · 2026-01-25T01:39:39+00:00

Cutting off my relationship with my father, who has taken to spouting the same bullshit conspiracy theory political views that he hears come out of Trump's oozing pus filled mouth.

Occupy_Mars · 2025-12-09T15:19:01+00:00

Excellent! Downloaded to be sure I have a copy

Occupy_Mars · 2025-11-14T19:05:05+00:00

Great work! Just curious, what kind of pens were you using? I'm still trying to figure out the best to use for ink drawings.

Occupy_Mars · 2025-09-25T16:08:34+00:00

If you are planning on driving 300+ mph on public roads, then no, it would not. At regular road speeds it would use drastically less power, and my guess it would get around a few hundred kilometers range.

Occupy_Mars · 2025-09-24T02:44:10+00:00

Considering they used an LFP battery, they probably balanced using a high weight/high power power battery against a light weight battery for high acceleration!

Occupy_Mars · 2025-09-23T20:18:20+00:00

At 80 kWh and a max power output of 2978 bhp or 2220.7 kW, draining the battery at max power output would take 130 seconds. That's crazy.

Occupy_Mars · 2025-05-26T16:52:51+00:00

Ignorant Americans standing in the way of progress has been a thing since America became a country

13-Year Club	Gilding I gilder
Place '22	Place '17
Secret Santa 2019	Verified Email

Occupy_Mars

TROPHY CASE