gcsfebactmp · pedrowrt · Jul 2, 2022 · Jul 2, 2022 · Jul 2, 2022 · Jul 2, 2022
diff --git a/.DS_Store b/.DS_Store
diff --git a/.arquivo2.txt b/.arquivo2.txt
@@ -0,0 +1 @@
+ola, tudo bem?
diff --git a/.nova/Configuration.json b/.nova/Configuration.json
@@ -0,0 +1,3 @@
+{
+  "workspace.name" : "git"
+}
diff --git a/arquivo.txt b/arquivo.txt
diff --git a/arquivo2.txt b/arquivo2.txt
diff --git a/arquivo_remoto.txt b/arquivo_remoto.txt
@@ -0,0 +1 @@
+Olá git
diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,14 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.0.1] - 2014-05-31
+
+### Added
+
+- Added arquivo.txt & arquivo2.txt
diff --git a/conflito.txt b/conflito.txt
@@ -0,0 +1,10 @@
+<<<<<<< HEAD
+olá, tudo bem?
+=======
+olá, tudo bem?
+<<<<<<< HEAD
+
+paragrafo novo
+=======
+>>>>>>> origin/main
+>>>>>>> main
diff --git a/github.txt b/github.txt
@@ -0,0 +1 @@
+olá github
diff --git a/new_file.txt b/new_file.txt
diff --git a/teste.txt b/teste.txt