Skip to content

Update lesson set-up to include setting git merge strategy #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexSurtees wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update lesson set-up to include setting git merge strategy #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13087a2
Update 02-setup.md
AlexSurtees Sep 24, 2025
1d62cc2
Update 02-setup.md
AlexSurtees Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions episodes/02-setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,21 @@ And on Windows:
$ git config --global core.autocrlf true
```

## Merge Strategy

As we already know, git is clever and can help us to combine two different versions of the same file that has been worked on in parallel. This is known as merging. There are multiple strategies that git can utilise to
merge two different versions:

1. Standard merge
2. Rebase

The exact details of these strategies are beyond the scope of this lesson, but a standard merge should be your default strategy unless there's a good reason to use rebase. We can set the default strategy git will use
with the command:

```
$ git config --global pull.rebase false
```

::::::::::::::::::::::::::::::::::::::::::::::::::

Alfredo also has to set his favorite text editor, following this table:
Expand Down