Skip to content
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

Adds in a section in 7 conflicts on comparing diffs across branches via GitHub #43

Merged
merged 1 commit into from
Jan 10, 2025
Merged

Adds in a section in 7 conflicts on comparing diffs across branches via GitHub #43

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
19 changes: 19 additions & 0 deletions episodes/06-conflict.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,26 @@ The far left shows how long ago the commit was that changed those lines.
Then the commit message is displayed before the file contents.
Click on the little page icon after a commit message to see previous
commits which altered the same lines.
Try using blame on the `CITATION.cff` file to see who added
the conflicting change.

### Compare changes

In the git-novice lesson we learnt how to diff between commits
on the same branch.
You can also look at diffs between branches even if they are on
a different fork using GitHub.

To see a difference for a repository add `/compare`
to the end of the repository url.

1. Navigate to: [`https://github.com/MetOffice/git-training-demo/compare/`](https://github.com/MetOffice/git-training-demo/compare/),
and click on the **compare across forks** link.
2. Click on the **head repository** dropdown and find your fork.
3. Click on the **compare** dropdown and select your feature branch.

A diff should appear comparing your fork's feature branch with
the upstream repositories `main` branch.

## Resolving Conflicts

Expand Down