mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-07 17:15:30 +02:00
Refactor CSS and JavaScript files for consistency; clean up whitespace and formatting
This commit is contained in:
parent
22515592f0
commit
7dfa6d55ba
56 changed files with 1607 additions and 1515 deletions
|
@ -1,4 +1,3 @@
|
|||
|
||||
# Branch Structure
|
||||
|
||||
The repository is structured as follows:
|
||||
|
@ -7,14 +6,14 @@ The repository is structured as follows:
|
|||
dev (main branch)
|
||||
| |
|
||||
| \--->-- stable (release branch)
|
||||
| ^
|
||||
| ^
|
||||
^ |
|
||||
| \-<- Hotfix (hotfixes directly from stable)
|
||||
|
|
||||
\-<- (features branches)
|
||||
```
|
||||
|
||||
The `central` branch is the main branch of the repository, and it is the default branch for the repository. The `twilight` branch is the feature branch, and it is branched off from the `central` branch. The `stable` branch is the release branch, and it is branched off from the `central` branch.
|
||||
The `central` branch is the main branch of the repository, and it is the default branch for the repository. The `twilight` branch is the feature branch, and it is branched off from the `central` branch. The `stable` branch is the release branch, and it is branched off from the `central` branch.
|
||||
|
||||
The `stable` branch may have hotfixes directly from the `stable` branch, and the `twilight` branch may have feature branches branched off from the `twilight` branch. This is done so that we can apply hotfixes like security patches directly to the `stable` branch without having to merge the changes from the `twilight` branch.
|
||||
|
||||
|
@ -34,4 +33,4 @@ To merge zen stable branch from the twilight branch, you can use the following c
|
|||
|
||||
```bash
|
||||
sh ./scripts/merge-to-branch.sh stable
|
||||
```
|
||||
```
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue