Merge branch 'release/1.0'

devops-wiki · Nov 29, 2023 · e86b0a3 · e86b0a3
2 parents 2c7a287 + db12c14
commit e86b0a3
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 0 deletions.
diff --git a/git-flow/README.md b/git-flow/README.md
@@ -0,0 +1,39 @@
+# Git flow 
+
+![Alt text](image.png)
+
+Iniciando o git flow 
+
+
+
+```
+git flow init 
+```
+
+Branch de produção [main]
+Branch de desenvolvimento [development] 
+Branch de suporte [feature/]
+Branch de bug [bugfix/] 
+Branch de testes [release/] 
+Branch de [hotfix/] 
+Branch de suporte [support/]
+Version tag prefix []
+
+
+Summary of actions:
+// Cria uma nova branch baseada na develop trazendo tudo para feature/css
+- A new branch 'feature/css' was created, based on 'develop'
+- You are now on branch 'feature/css'
+
+Now, start committing on your feature. When done, use:
+
+     git flow feature finish css
+
+git flow feature start css 
+
+
+Finalizando a branch feature 
+
+git flow feature finish css 
+
+Criando a release 1.0 para ser testada
diff --git a/git-flow/image.png b/git-flow/image.png
diff --git a/git-flow/index.html b/git-flow/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Git Flow Example</title>
+</head>
+<body>
+  <h1>Git Flow Example</h1>
+  <p>This is a simple example of how to use git flow.</p>
+  <p>The code in this file is just a placeholder. You can replace it with your own code.</p>
+</body>
+</html>
diff --git a/git-flow/style.css b/git-flow/style.css
@@ -0,0 +1,14 @@
+body {
+  font-family: sans-serif;
+  font-size: 16px;
+  line-height: 1.5;
+}
+
+h1 {
+  font-size: 24px;
+  font-weight: bold;
+}
+
+p {
+  margin-bottom: 10px;
+}