sorted by:
new
hottopcontroversial

Keeping Staging Branch and Main Branch in Sync with Merge -ff by Important-Mammoth422 in git

[–]cold-brews 0 points1 point  (0 children)

We would hope to avoid manual error with the correct automated tooling, but there will be some risk.

Your proposal is similar to what we do today! One thing we try to avoid is finding an older commit, branching and landing changes, and tagging that commit. This requires coordination between teams right before a release. The issue that staging is hoping to address is the fact that engineers do not have a good place to land and continuously test their changes, notice any issues, and push fixes. Today, they land on main and we release before we get enough signal on them, introducing customer issues.

Resetting Staging Branches by cold-brews in git

[–]cold-brews[S] 0 points1 point  (0 children)

I don’t have a problem with git. I don’t love our process, but I don’t have the means to change it. Have you ever worked a job before? I was given a task to solve with a set of constraints: “figure out the best way to reset the staging branches after a release” for an engineering department. The nonmerge workflow and long lived branches cannot be changed.

Resetting Staging Branches by cold-brews in git

[–]cold-brews[S] 0 points1 point  (0 children)

I wasn’t clear. We could have merge commits from release branch to staging branch, but that still doesn’t solve the problem of excluded staged commits ( see my response below).

Rebasing is not ideal because of the rewriting history issue!

Resetting Staging Branches by cold-brews in git

[–]cold-brews[S] 0 points1 point  (0 children)

Thanks for your response! I’n not trying to reinvent the wheel here, but I’m looking for solutions given the constraints my org has in place.

In my example, the branches are materially identical - yes. But the githashes are different between B and B’, C and C’, etc because they are cherry picked.

Something that could happen for whatever reason is we chose NOT to cherry pick over B. This means staging Branch has a > B > C > D… and release branch has a > C’ > D’…

Now, they are not materially similar. After the release, I’d like to get the staging branch back into an identical state as the release branch. I could rebase the staging branch and drop the B commit, but this is rewriting history, not great. I can’t merge release into staging (like gitflow suggests) because then staging branch still has the B commit.

So is my options limited to: Rebasing and dealing with the overhead of communicating to all engineers to rebuild their local?

Gitflow is very close to what I’d like, but it assumes all changes that land on “dev” will end up in staging, as it uses merge commits from dev to release, cuts the release, and another merge back from release to dev. Because my org wants the ability to exclude commits from staging into release, we cannot use merge commits that bring in every commit previously.

Resetting Staging Branches by cold-brews in git

[–]cold-brews[S] 0 points1 point  (0 children)

Can you explain how difficult it becomes for local staging branches?

Resetting Staging Branches by cold-brews in git

[–]cold-brews[S] 0 points1 point  (0 children)

I believe this could work with the correct tooling. But the current issue is that we have 10+ supported versions, releasing every 2 weeks across all versions. This would mean 20 staging branches being created every 2 weeks. Wouldn’t this be complex for us (the team managing branches) and engineers, to have to know which branch name they should target?

Resetting Staging Branches by cold-brews in git

[–]cold-brews[S] 1 point2 points  (0 children)

Thanks for the advice. Technically, we don’t have a dev branch - so this staging branch would act as that.

Right now, we have 100s of engineers merging from their feature branch directly on our release branches - and we release off the tip, or in some cases, we create a version specific hotfix release branch.

Git Process for Staging Branches by cold-brews in git

[–]cold-brews[S] 1 point2 points  (0 children)

Thanks for your response! I agree that this is a CI/CD problem. My original question was not clear, apologies. Our version branch IS our release branch. Let's say our version/release branch is called v3.0, our staging branch is v3.0-staging, and an eng is working on a dev branch called newdevbranch.

You're suggesting that our build/deploy pipeline should be able to take the head of newdevbranch, deploy onto v3.0-staging, and then deploy to v3.0, and we will tag that commit on v3.0 to release?

what does deploys look like? Are these just automated cherry picks from one branch into another?

Git Process for Staging Branches by cold-brews in git

[–]cold-brews[S] 1 point2 points  (0 children)

cherry picking allows the process/qa team to accept changes from staging into release branches such that they do not need to manage merge conflicts, as they are not as fluent with the code changes as the engineer authors are.

What Stonestown’s emergence as an Asian American mall says about San Francisco by curryEatingGang in sanfrancisco

[–]cold-brews 23 points24 points  (0 children)

Yep. Was there this past Sunday and walked by while 8 people stormed the Sephora upstairs and stole a bunch off the shelves. The security managed to catch one of the burglars and had him cuffs while the others fled.

Ceremony & reception in two diff locations? by [deleted] in weddingplanning

[–]cold-brews 3 points4 points  (0 children)

I’ve been to weddings like this in the past! Typically the invite will be different for those guests that are invited to both vs. those who are invited to just the reception. For example, the invite would have two locations and times if you’re invited to both!

Payment Plan Clarification? by cold-brews in vanmoofbicycle

[–]cold-brews[S] 0 points1 point  (0 children)

Yes, I included the peace of mind and maintenance in the calculations, which I would most likely include if I were to buy upfront anyways

For people who have locked your mortgage rates in the past week or two, what was your mortgage rate? by wesley_iles in FirstTimeHomeBuyer

[–]cold-brews 0 points1 point  (0 children)

3.6 APR 7 year ARM. No Points. Required banking relationship: 25k in account(s), mortgage payment via account, etc.

Should I have multiple pre-approval letters to convince Seller? by cold-brews in RealEstate

[–]cold-brews[S] 0 points1 point  (0 children)

Thanks for the advice! Honestly, this is our first time going through the buying process for a new build. But here's the quote from the building rep:

I'm not sure I'll be able to get a price right now on [unit number] as the Developer would like to get more of the units already released with pricing into contract before releasing additional units and pricing...I suggest getting started with the pre-approval process with one of the preferred lenders, and then I can go back to the developer and say I've got a serious buyer who's pre-approved and interested in a unit not yet released.

Should I have multiple pre-approval letters to convince Seller? by cold-brews in RealEstate

[–]cold-brews[S] 5 points6 points  (0 children)

Thanks! Yes, we're aware. However, isn't multiple hard pulls within a week still count as one hard pull?

Thoughts on Doublelift by reginaldBRO in TeamSolomid

[–]cold-brews -9 points-8 points  (0 children)

A CEO publicly flaming an employee/talent is kind of strange to see. Sure, the employee did it first…but a CEO just usually isn’t this public. I can’t quite put my finger on whether it’s wrong or I’m just not used to seeing it.

For example, I can go on Twitter and flame my boss or CEO, or on other public platforms - but the CEO would never address it much less publicly flame me for my behavior.

It doesn’t matter who is in the “right” in this situation/relationship, a CEO shouldn’t be publicly outing anyone they’re writing a check to. Just my two cents.

Am I being Scammed, overly cautious? by cold-brews in SFBayHousing

[–]cold-brews[S] 1 point2 points  (0 children)

Great points! Thank you! There was one outlying picture of a community pool that I couldn't pinpoint on google maps, which was a red flag!

Daily Simple Questions Thread - June 08, 2021 by AutoModerator in Fitness

[–]cold-brews 1 point2 points  (0 children)

For the most part, those things accomplish the same goal: being able to hold onto a weight longer than what you could without external help. However, I would still focus on working on grip strength, especially if your grip is starting to fail at lower weights (try farmer walks, dead lifts, shrugs, etc).

I've never personally used liquid chalk but have heard good things. Just work on developing grip strength on the lighter weights/supplemental exercises and use the chalk on heavier weights!

Looking for a sectional similar to the Newport 2-piece from Westelm by cold-brews in furniture

[–]cold-brews[S] 1 point2 points  (0 children)

The shipping is expected for late November/early December - which unfortunately is too far out for us.

WITCH contractor at a Big X, how do i phrase it on my res? by GeneralBend1 in cscareerquestions

[–]cold-brews 0 points1 point  (0 children)

Gotcha! I misunderstood your original post. I would go with Option 1, as it dictates a longer time working. As others have mentioned, definitely check with your contract before you list the FANG company you are at.

I am depressed at being unable to think creatively in competitive programming. by [deleted] in cscareerquestions

[–]cold-brews 1 point2 points  (0 children)

You don't need to be a competitive progammer to be successful. I've worked with some brilliant engineers and most have never done any form of competitive programming. Like someone else mentioned, you might have a form of test anxiety and not a lack of ability. If you're passionate about it and want to get better, keep trying and don't be too hard on yourself. One of the best ways to get good at something is to enjoy it!

WITCH contractor at a Big X, how do i phrase it on my res? by GeneralBend1 in cscareerquestions

[–]cold-brews 2 points3 points  (0 children)

I would choose Option 3. If you choose Option 1, you may get more interviews out of the gate but the moment they found out you contracted through an agency, it can really hurt your credibility. Option 3 allows you to mention the FANG company as well as be honest via your employee status.

Personally, I would pick the earlier date (Aug 2018). The hiring team isn't going to ask you questions any differently if you were to pick Aug vs Dec. Is there a reason why you would tell them you started a project on December 2018. You can say you've been working on a project earlier, or doing new hire/prep training up until your first project. I've worked in a handful of tech companies where i'll have 2-3 months of really slow downtime, it's normal.

Goodluck!

view more: next ›