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 first deployment? Do it all in one feature branch and then merge that into main, or just not worry about it and have non-deployable code in main for a while?
What to do with GitHub Flow before initial deployment so main branch is "always deployable"?
222 Views Asked by sr3 At
1
There are 1 best solutions below
Related Questions in GIT
- Can MVC.NET prevent SQL-injection at razor or controller level?
- Getting and passing MVC Model data to AngularJS controller
- Access property of an object of type [Model] in JQuery
- Entity Framework Code First with Fluent API Concurrency `DbUpdateConcurrencyException` Not Raising
- Bundling and minification issue in MVC
- ASP-MVC Code-first migrations checkbox not active
- Why does Azure CloudConfigurationManager.GetSetting return null
- Dynamic roles list in CustomAuthorize ASP MVC
- Jquery: Change contents of <select> tag dynamically
- Why web API return 404 when deploy to IIS
Related Questions in GITHUB
- Can MVC.NET prevent SQL-injection at razor or controller level?
- Getting and passing MVC Model data to AngularJS controller
- Access property of an object of type [Model] in JQuery
- Entity Framework Code First with Fluent API Concurrency `DbUpdateConcurrencyException` Not Raising
- Bundling and minification issue in MVC
- ASP-MVC Code-first migrations checkbox not active
- Why does Azure CloudConfigurationManager.GetSetting return null
- Dynamic roles list in CustomAuthorize ASP MVC
- Jquery: Change contents of <select> tag dynamically
- Why web API return 404 when deploy to IIS
Related Questions in BRANCHING-AND-MERGING
- Can MVC.NET prevent SQL-injection at razor or controller level?
- Getting and passing MVC Model data to AngularJS controller
- Access property of an object of type [Model] in JQuery
- Entity Framework Code First with Fluent API Concurrency `DbUpdateConcurrencyException` Not Raising
- Bundling and minification issue in MVC
- ASP-MVC Code-first migrations checkbox not active
- Why does Azure CloudConfigurationManager.GetSetting return null
- Dynamic roles list in CustomAuthorize ASP MVC
- Jquery: Change contents of <select> tag dynamically
- Why web API return 404 when deploy to IIS
Related Questions in GITHUB-FLOW
- Can MVC.NET prevent SQL-injection at razor or controller level?
- Getting and passing MVC Model data to AngularJS controller
- Access property of an object of type [Model] in JQuery
- Entity Framework Code First with Fluent API Concurrency `DbUpdateConcurrencyException` Not Raising
- Bundling and minification issue in MVC
- ASP-MVC Code-first migrations checkbox not active
- Why does Azure CloudConfigurationManager.GetSetting return null
- Dynamic roles list in CustomAuthorize ASP MVC
- Jquery: Change contents of <select> tag dynamically
- Why web API return 404 when deploy to IIS
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular # Hahtags
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
Note: Branching strategies are just guidelines.
GitHub Flow works best with CI/CD, which usually means you will deploy soon after features are merged. In theory you may have to lock down the
mainbranch temporarily between validating what you're about to deploy, and when you deploy it, so that nothing slips intomainduring that time that hasn't yet passed the fully integrated validation. If your release cycle is fast enough this is relatively low impact.However, if you have a long release and/or validation cycle you may want to look at other workflows. Perhaps the most common alternative from which many other flows are based, is Git Flow, which allows for taking time to harden and validate release branches, as well as simultaneous development of new features while the release branch is baking, without requiring code freezes.
Another good alternative is gitworkflows. The basic idea here is you make a temporary copy of
main, callednext, which is used for partial integration testing until your feature branches are ready to merge intomain, and then periodically you resetnextback tomainto clear out the old commits that didn't make the final cut.At my organization we use all 3 of these workflows (and others), and the choice mostly depends on the length of the release cycle of each product.
If you have a long(ish) release cycle and wish to stay with GitHub Flow, you could do as you suggested and use an extended feature branch. Note if you do this it would technically be more accurate to call it a "release" branch, since multiple "features" would likely be present on it. At this point you wouldn't really be doing GH Flow anymore, but I'm pretty sure the Git Branching Strategy Police won't come knocking on your door.