Merge a branch into main

Bring the finished work from your branch back into the main version.

Fill these in once

Branch to merge

Switch to main
Terminal
```
git switch main
```
Get the latest main
Terminal
```
git pull
```
Skip this if the project isn't on GitHub yet.
Merge your branch in
Terminal
```
git merge fix-login-button
```
If Git says there's a conflict, see “Fix a merge conflict”.
Share it on GitHub
Terminal
```
git push
```

Check it worked

See the history
Terminal
```
git log --oneline --graph -10
```

Undo it

Stop a merge that's gone wrong
Terminal
```
git merge --abort
```
Works while the merge is still in progress. Everything goes back to how it was.

Switch to main
Terminal · Ubuntu / Debian
```
git switch main
```
Get the latest main
Terminal · Ubuntu / Debian
```
git pull
```
Skip this if the project isn't on GitHub yet.
Merge your branch in
Terminal · Ubuntu / Debian
```
git merge fix-login-button
```
If Git says there's a conflict, see “Fix a merge conflict”.
Share it on GitHub
Terminal · Ubuntu / Debian
```
git push
```

Check it worked

See the history
Terminal · Ubuntu / Debian
```
git log --oneline --graph -10
```

Undo it

Stop a merge that's gone wrong
Terminal · Ubuntu / Debian
```
git merge --abort
```
Works while the merge is still in progress. Everything goes back to how it was.

Switch to main
PowerShell
```
git switch main
```
Get the latest main
PowerShell
```
git pull
```
Skip this if the project isn't on GitHub yet.
Merge your branch in
PowerShell
```
git merge fix-login-button
```
If Git says there's a conflict, see “Fix a merge conflict”.
Share it on GitHub
PowerShell
```
git push
```

Check it worked

See the history
PowerShell
```
git log --oneline --graph -10
```

Undo it

Stop a merge that's gone wrong
PowerShell
```
git merge --abort
```
Works while the merge is still in progress. Everything goes back to how it was.

New to Merge? I explain it in plain English on Layman Terms.