GitHub collaboration

Use a safe local example to learn how to combine changes without losing them when several people edit the same file.

The baseline exercise uses a temporary local Git repository. You can explore changes, branches, and merges without a GitHub account or a remote repository connection.

Starting conditions

repo is temporary storage on the computer running the notebook kernel. In README.md inside it, change Condition: baseline to Condition: test.

Procedure

1. After checking the baseline commit, read repo/'README.md' in a new code cell in the same notebook, change only the specified sentence, and save. Resolve file paths relative to repo.
2. Call the provided git(*args) function in a code cell and record the diff and status. For example, you can display changes with print(git('diff')).
3. Commit the changes, then check the difference from the previous commit again.

Results to retain

• A 3-row table for before editing, after editing, and after committing, plus a diff code block.

Starting conditions

Create an experiment branch in the same repository and add Rate: 10 Hz to README.md.

Procedure

1. After committing on experiment, return to main and compare the file contents.
2. Inspect both branches' histories with log --oneline --all --graph.
3. After merging into main, describe what remains in the file and history.

Results to retain

• A table showing before and after branching, plus history text or 1 screenshot.

Starting conditions

Change the same Condition line to different values on main and experiment, and commit each change.

Procedure

1. Attempt the merge and keep the file containing conflict markers.
2. Resolve the conflict by writing the final selected condition on one line, then commit.
3. Explain the difference between editing different lines and editing the same line.

Results to retain

• Code blocks before and after the conflict, and 3 sentences explaining the resolution.