Questions tagged [github-flow]
8 questions
12
votes
5 answers
Development and Production Environments with GitHub flow
At work, we're now using GitHub, and with that GitHub flow. My understanding of GitHub flow is that there is a master branch and feature branches. Unlike git flow, there is no develop branch.
This works quite well on projects that we've done, and…
Nathan Sainsbury
- 383
- 3
- 12
1
vote
1 answer
What to do with GitHub Flow before initial deployment so main branch is "always deployable"?
So GitHub Flow seems to advocate keeping the main branch as the only permanent branch and sprouting off and merging ephemeral feature branches. It also says main should "always be deployable". What do you do while you're still building towards your…
sr3
- 389
- 2
- 4
- 15
1
vote
1 answer
Creating a new environment per branch with Terraform CI/CD
In one of my projects we are using GitHub flow. The branching model follows:
A ticket is created on Jira (OSCS-103)
A branch is created from master, called OSCS-103.
A PR is created on this branch as soon as it's created, with a custom environment…
Nathan Sainsbury
- 383
- 3
- 12
1
vote
0 answers
Trunk-Based Deployment: How do you avoid Feature Flag Clutter?
For developers that use Trunk-based development, how have you approached dealing with an ever-growing collection of feature flags in your codebase?
My concern is if you are heavily leveraging feature flags for every release and every new feature,…
Glen Cooney
- 107
- 5
1
vote
1 answer
How to merge and tag bugfix for previous release in GitHub flow
We're following a GitHub flow strategy (creating feature/bugfix branches off master, and merging them back in via pull request once done). We also tag versions as each new release of the software is shipped.
We've found a bug in an old version…
Jonny
- 3,807
- 8
- 31
- 48
0
votes
2 answers
Several feature branches in the Github Flow
I have a question regarding the GitHub flow and specifically about how to manage multiple features developed at the same time.
Let assume we have a simple CSS file.
.container{
height: 500px;
width: 500px;
background-color: blue;
…
MattL
- 109
- 3
- 12
0
votes
1 answer
error: Merge failed: Something went wrong during merge: 3:invalid byte sequence in US-ASCII. Please try again. on GitLab
Using GitLab
Received the following error message.
Merge failed: Something went wrong during merge: 3:invalid byte sequence in US-ASCII. Please try again.
solution to follow.
codeangler
- 779
- 8
- 16
-1
votes
1 answer
What are the correct step by step commands for gitflow workflow?
What does one complete lifecycle of gitflow look like?
Which branch is pushed to production: release or main?
I have done deep research on this topic. But these were the questions whose answers I couldn't find.
Any suggestion gratefully received.…
Curious Learner
- 1,182
- 1
- 4
- 17