Git Programming Tutorials, Guides & Best Practices

   git reset HEAD^

Git's rerere (reuse recorded resolution) automatically remembers how you resolved conflicts in the past.

No preview available for this content.

• Workflows: Define the automated processes and are triggered by events (e.g., push, pull request).
• Jobs: A workflow is made up of one or more jobs, which are units of work executed on a runner.
• Steps: Each job contains steps that run commands in a sequence.
• Actions: Reusable commands or tasks that can be executed within steps.

Let’s start by setting up a simple workflow that runs tests every time code is pushed to the repository.

Interactive staging is a powerful feature that allows you to selectively stage parts of your changes, making it easier to create clean and focused commits. This is particularly useful when you’ve made multiple changes in a file and want to commit them separately.

# Open the interactive staging interface
git add -p

# Open an interactive rebase interface (also includes staging options)
git rebase -i <branch>

# Open an interactive patch creation interface
git diff --cached -p