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.

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

Newfeature/pull requests #25

Merged
merged 10 commits into from
Feb 14, 2025

Conversation

Lsnaathorst1
Copy link
Contributor

Overview of changes

Pull request to ask for feedback on structure and new content

Why are these changes being made?

These changes have been made to add information on creating a development branch and pull requests into Git Academy

Reviewer instructions

Please could you give some general feedback on if how I have laid this out seems okay before I perfect it. I have purposely not gone into detail on resolving conflicts as it feels like it would be too much and needs its own section. I have tried to add in the different methods where I am able - are all the right methods there?

Lsnaathorst1 and others added 7 commits January 31, 2025 10:29
- Adding pull requests draft (without screenshots)
- Renaming making a development branch file to remove typo
- Adding instruction to go to gitlog and update to save they have made a dev branch to be able to later pull make into their main branch
- Removing VS code picture for now as have never used and can't work out how
…how to push (to make pull requests section flow better)
- Updating git to Git
- Adding screengrabs
- Adding section on reviewing PRs - Deleting unused screengrab

- Haven't gone into detail on conflict resolution - another tab?
@Lsnaathorst1 Lsnaathorst1 requested a review from rmbielby February 6, 2025 12:00
Copy link
Contributor

@rmbielby rmbielby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, few small changes and a bit of moving things around.

git-refresher/making-a-development-branch.qmd Outdated Show resolved Hide resolved
git-refresher/making-a-development-branch.qmd Outdated Show resolved Hide resolved
git-refresher/pull-requests.qmd Outdated Show resolved Hide resolved
git-refresher/pull-requests.qmd Outdated Show resolved Hide resolved
git-refresher/pull-requests.qmd Outdated Show resolved Hide resolved
git-refresher/pull-requests.qmd Outdated Show resolved Hide resolved
git-refresher/pull-requests.qmd Outdated Show resolved Hide resolved
git-refresher/pull-requests.qmd Outdated Show resolved Hide resolved
glossary.qmd Outdated Show resolved Hide resolved
Lsnaathorst1 and others added 3 commits February 13, 2025 08:48
Co-authored-by: Rich Bielby <richard.bielby@education.gov.uk>
Co-authored-by: Rich Bielby <richard.bielby@education.gov.uk>
Amending based on Rich's feedback
* Changing making a development branch to 'making more branches'
* splitting pull requests out into two pages - creating and reviewing a PR
* Moving two pull requests and associated images to github-devops-refresher section
@rmbielby rmbielby merged commit 5881829 into newcontent/basics-refresher Feb 14, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants