Skip to content

Polishing GH branch chapter #241

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

Merged
merged 58 commits into from
Apr 18, 2022
Merged

Polishing GH branch chapter #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
f238e27
rm PR in-depth screen shots from branches
jukent Mar 2, 2022
9a1846a
fix prereqs and whats next
jukent Mar 2, 2022
c45154a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 2, 2022
edc0fb4
rm workflow
jukent Mar 2, 2022
13dbc45
Merge branch 'branchPR' of https://github.com/jukent/pythia-foundatio…
jukent Mar 2, 2022
73eccb7
sp
jukent Mar 2, 2022
1e9d960
create workflow.md
jukent Mar 2, 2022
10dedc3
new pr w screenshots
jukent Mar 2, 2022
f78e439
add workflows to toc
jukent Mar 2, 2022
b3b91f6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 2, 2022
b5e219e
add git logo
jukent Mar 2, 2022
a53feb9
's
jukent Mar 2, 2022
c50cb67
rm bots
jukent Mar 2, 2022
3d14395
add merging
jukent Mar 2, 2022
837c9d1
add local to local merge
jukent Mar 2, 2022
7fc2f2f
Merge branch 'workflow' of https://github.com/jukent/pythia-foundatio…
jukent Mar 2, 2022
f0e03a2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 2, 2022
67237c9
comments from the doc
jukent Mar 2, 2022
b433bee
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 2, 2022
660a5dc
add blurb before overview
jukent Mar 2, 2022
7232e3d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 2, 2022
5c6d135
Update foundations/github/git-branches.md
jukent Mar 4, 2022
740343e
Update foundations/github/git-branches.md
jukent Mar 4, 2022
9f9afa5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 4, 2022
3eeb563
Update foundations/github/git-branches.md
jukent Mar 4, 2022
1b5c395
add local merge diagram
jukent Mar 4, 2022
af6a2dc
add diagram and merge conflict def
jukent Mar 4, 2022
4735784
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 4, 2022
46c3a68
Merge branch 'ProjectPythia:main' into branchPR
jukent Mar 4, 2022
0081500
Merge branch 'ProjectPythia:main' into workflow
jukent Mar 4, 2022
d8b298e
Merge branch 'workflow' into branchPR
jukent Mar 4, 2022
031f503
undo merge in from workflow
jukent Mar 4, 2022
a1b8a54
add workflow back
jukent Mar 4, 2022
5fcdaf1
rm workflow changes
jukent Mar 4, 2022
aad61d3
revert PR file
jukent Mar 4, 2022
453936e
Update foundations/github/git-branches.md
jukent Mar 4, 2022
265ee86
Update foundations/github/git-branches.md
jukent Mar 4, 2022
dbb8117
update diagrams
jukent Mar 4, 2022
30d64dc
add git pull par
jukent Mar 4, 2022
bf8b180
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 4, 2022
112c88b
sm edit to caption
jukent Mar 4, 2022
ea43fd1
Merge branch 'main' into branchPR
jukent Mar 9, 2022
ba3da02
Merge branch 'ProjectPythia:main' into branchPR
jukent Apr 12, 2022
a57d94d
add new images, update text
jukent Apr 14, 2022
56a4b91
Merge branch 'branchPR' of https://github.com/jukent/pythia-foundatio…
jukent Apr 14, 2022
8996160
replace images w new gifs
jukent Apr 14, 2022
e4e8685
add new gifs
jukent Apr 14, 2022
48970d7
update doc
jukent Apr 14, 2022
26d723c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 14, 2022
decdf7b
update terminal screenshots
jukent Apr 14, 2022
2f82492
fix 2 gifs
jukent Apr 14, 2022
0e553ba
add slide numbers to gifs
jukent Apr 14, 2022
725e47b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 14, 2022
5cf9429
update gifs
jukent Apr 14, 2022
83db804
Update foundations/github/git-branches.md
jukent Apr 18, 2022
3831bee
Update foundations/github/git-branches.md
jukent Apr 18, 2022
1ed2d8f
Update foundations/github/git-branches.md
jukent Apr 18, 2022
ab5523d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Apr 18, 2022
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
180 changes: 87 additions & 93 deletions foundations/github/git-branches.md
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified images/4-gitnewbranch.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/5-gitcheckout.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/6-samplechange.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/6a-gitadd.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/6b-gitlog.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/6c-gitpush.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/6d-setupstream.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/7-github-branchandstatus.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/PR.png
View file
Open in desktop
Binary file not shown.
Binary file removed images/basicbranch.png
View file
Open in desktop
Binary file not shown.
Binary file added images/branching.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cloning.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/deletingbranch.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/git branching.pptx
View file
Open in desktop
Binary file not shown.
Binary file added images/gitworkflow.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/pull.png
View file
Open in desktop
Binary file not shown.
Binary file added images/pulling.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/pullrequest.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/pushing.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/remote.png
View file
Open in desktop
Binary file not shown.
Binary file removed images/remotePR.png
View file
Open in desktop
Binary file not shown.
Binary file removed images/team.png
View file
Open in desktop
Binary file not shown.