Skip to content

Commit

Permalink
Merge pull request #994 from swcarpentry/martinosorb-patch-2
Browse files Browse the repository at this point in the history 
Remove 'AFK'
  • Loading branch information
@erinmgraham
erinmgraham authored Jul 3, 2024
2 parents 40f3e37 + 261833c commit 6ac14c6
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions episodes/09-conflict.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,24 +502,24 @@ started.
| order | action . . . . . . . . . . | command . . . . . . . . . . |
| ----- | -------------------------- | --------------------------------------------- |
| 1 | | |
| 2 | | `echo 100 >> numbers.txt` |
| 2 | | `echo 100 >> numbers.txt` |
| 3 | | |
| 4 | | |
| 5 | | |
| 6 | Celebrate! | `AFK` |
| 6 | Celebrate! | |

::::::::::::::: solution

## Solution

| order | action . . . . . . | command . . . . . . . . . . . . . . . . . . . |
| ----- | -------------------------- | --------------------------------------------- |
| 1 | Update local | `git pull origin main` |
| 2 | Make changes | `echo 100 >> numbers.txt` |
| 3 | Stage changes | `git add numbers.txt` |
| 4 | Commit changes | `git commit -m "Add 100 to numbers.txt"` |
| 5 | Update remote | `git push origin main` |
| 6 | Celebrate! | `AFK` |
| 1 | Update local | `git pull origin main` |
| 2 | Make changes | `echo 100 >> numbers.txt` |
| 3 | Stage changes | `git add numbers.txt` |
| 4 | Commit changes | `git commit -m "Add 100 to numbers.txt"` |
| 5 | Update remote | `git push origin main` |
| 6 | Celebrate! | |

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

Expand Down

0 comments on commit 6ac14c6

Please sign in to comment.