Skip to content

Admin training: add some lines on how to apply a diff #6515

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
bernt-matthias wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Admin training: add some lines on how to apply a diff #6515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 topics/admin/faqs/diffs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,21 @@ layout: faq
contributors: [hexylena]
---

In short a diff defines the changes needed to get from an old content of the files in a directory to new content of these files.
For the sake of the tutorials this allows to deterministacally modify file contents and to minimise errors during editing.

> > <code-in-title>Apply a diff</code-in-title>
> >
> > Given a diff (abbreviated as `DIFFLINES` in the following) the edit desribed can be executed using the following lines.
> >
> > ```
> > $ patch -p1 << 'EOF'
> > DIFFLINES
> > EOF
> > ```
> {: .code-in}


If you haven't worked with diffs before, this can be something quite new or different.

If we have two files, let's say a grocery list, in two files. We'll call them 'a' and 'b'.
Expand Down