Latex Paper Template

Arquivos a compilar

Por padrão, todos os arquivos .tex que estão na pasta src serão compilados. Para definir um subconjunto de arquivos raiz a serem compilados, criar arquivo .env.texfiles na pasta src/. Para adicionar compilar os arquivos paper00.tex e pasta1/paper01.tex dentro da pasta src/, adicionar ao arquivo .env.texfiles a seguinte linha:

TEXFILES="paper00.tex pasta1/paper01.tex"

Compilar latex

Para compilar:

make

Para limpar tudo sobre a compilação:

make clean

Para limpar apenas os arquivos temporários:

rm -rf tmp

Ambiente de desevolvimento com vscode

Instalar docker e extensão ms-vscode-remote.remote-containers. Em seguida, use CTRL+SHIFT+P e escolha "Dev Containers: Reopen in Container". Espere a montagem do container e está tudo pronto.

Pacotes latex

Se tiver um pacote faltando, buscar com

tlmgr search -global <pacote>

e instalar com

sudo tlmgr install <pacote>

Se resolver pacote faltando, adicionar em .devcontainer/descontainer.json.

Links

latexmk

Vídeo de integração de latex com github com CI

Git Workflow Guide

This document explains the typical Git workflow used in collaborative software projects, including how to:

• Clone a repository
• Create a new branch
• Open a Pull Request (PR)
• Resolve merge conflicts on a PR

---

1. Clone a Repository

To start working on a project, first clone the remote repository to your local machine:

git clone git@github.com:<repository>.git
cd <repository>

---

2. Create a New Branch

It’s best practice to create a new branch for each feature or bugfix:

git checkout -b my-feature-branch

This creates and switches to a new branch called my-feature-branch.

---

3. Work, Commit, and Push

Make your changes locally, then stage and commit them:

git add .
git commit -m "Add feature XYZ"

Push your branch to the remote repository:

git push origin my-feature-branch

---

4. Open a Pull Request (PR)

Go to the repository on GitHub. You’ll usually see a prompt to open a Pull Request for your pushed branch. If not, navigate to the Pull Requests tab and click New pull request.

• Choose your branch as the source
• Choose the target branch (often main)
• Add a descriptive title and detailed description
• Submit the PR for review

---

5. Resolving Merge Conflicts

If your PR cannot be merged automatically due to conflicts, follow these steps:

a. Fetch latest changes from the target branch

git fetch origin
git checkout my-feature-branch
git merge origin/main

(or replace main with the target branch name)

b. Resolve conflicts manually

Git will mark conflicts in the files. Open the conflicting files and look for sections like:

<<<<<<< HEAD
Your changes
=======
Incoming changes from main
>>>>>>> main

Edit the file to keep the desired code, then remove the conflict markers (<<<<<<<, =======, >>>>>>>).

c. Stage and commit the resolved files

git add <file1> <file2> ...
git commit -m "Resolve merge conflicts"

d. Push the updated branch

git push origin my-feature-branch

The PR will update automatically.

---

Summary

# Clone repository
git clone git@github.com:victoitor/ConstantCongestionBramble.git
cd ConstantCongestionBramble

# Create and switch to a new branch
git checkout -b my-feature-branch

# Work, commit, and push
git add .
git commit -m "Description"
git push origin my-feature-branch

# Update branch with target branch changes (for conflicts)
git fetch origin
git merge origin/main

# Resolve conflicts, commit, and push again
git add <resolved files>
git commit -m "Resolve merge conflicts"
git push origin my-feature-branch