Skip to content

Merging experiments #84

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

Open
wants to merge 64 commits into
base: merging-experiments
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
03b06bf
updating images and links
NataliaLKB Mar 31, 2015
c1cd612
updating resources anchor
NataliaLKB Mar 31, 2015
7efa9a5
adds git-status image
NaomiGaynor Mar 31, 2015
5e25f03
adds instructions to redirect into directory created by git clone com…
NaomiGaynor Mar 31, 2015
d2d53c1
corrects typo
NaomiGaynor Mar 31, 2015
e095b07
Merge pull request #1 from NaomiGaynor/tutorial-edits
NataliaLKB Mar 31, 2015
022ad86
adding merge commits section
NataliaLKB Mar 31, 2015
b15f860
merging with remote changes
NataliaLKB Mar 31, 2015
f29c7aa
updating merge-conflict images
NataliaLKB Mar 31, 2015
f6829a4
replacing PR with Pull request to make it more consistent
NataliaLKB Apr 1, 2015
eacc347
adding further description of `origin`
NataliaLKB Apr 1, 2015
c281ead
embelishing the message section about commits to include how you get …
NataliaLKB Apr 1, 2015
1e1d465
describing more clearly what happens on a git push based on #2
NataliaLKB Apr 1, 2015
949a2a6
Merge pull request #3 from NataliaLKB/minor-additions
NataliaLKB Apr 1, 2015
492eb9b
deleting duplicate instructions
NataliaLKB Apr 2, 2015
e7edd79
Merge pull request #4 from NataliaLKB/minor-additions
NataliaLKB Apr 2, 2015
34bc9d5
Making the commit message guidelines into bullet points for quick rea…
NataliaLKB Apr 2, 2015
b63a144
Merge pull request #5 from NataliaLKB/aesthetics
NataliaLKB Apr 2, 2015
abc94e4
fixing spelling error in commit messages section
NataliaLKB Apr 2, 2015
1116839
braking up detached state paragraph into smaller sections
NataliaLKB Apr 2, 2015
391fe98
changed description of tutorial for full time students, to just stude…
NataliaLKB Apr 7, 2015
4e6113c
changing initial `git branch new-branch` to `git branch my-new-branch…
NataliaLKB Apr 7, 2015
9983116
Merge pull request #26 from NataliaLKB/semantics
NataliaLKB Apr 12, 2015
16f2915
fixing typos mentioned in #13
NataliaLKB Apr 12, 2015
5d7deb4
fixing git-for-collaboration link problem mentioned in #19
NataliaLKB Apr 12, 2015
0b2e226
Merge pull request #27 from NataliaLKB/typos
NataliaLKB Apr 12, 2015
642a8f2
Revert "Typos"
NataliaLKB Apr 12, 2015
09c330d
Merge pull request #28 from NataliaLKB/revert-27-typos
NataliaLKB Apr 12, 2015
8428c10
fixing small typos mentionedi in 19
NataliaLKB Apr 12, 2015
8bec538
Merge pull request #29 from NataliaLKB/typos
NataliaLKB Apr 12, 2015
bb9e8fa
added recommended brew tutorial #21
NataliaLKB Apr 12, 2015
236fc0a
Merge pull request #30 from NataliaLKB/brew
NataliaLKB Apr 12, 2015
eb2edc4
adds more links to resources section: https://github.com/NataliaLKB/l…
nelsonic Apr 28, 2015
bc0d91a
Merge pull request #31 from nelsonic/moar-resources
NataliaLKB Apr 28, 2015
972c4e5
makes name of new branch in ###Branching consistent
May 4, 2015
94b3259
Merge pull request #33 from rjmk/branch-naming
NataliaLKB May 5, 2015
65f829d
Added a section on changing file structure
patrickwalkowicz Sep 15, 2015
306ed7a
Added git mv command in cheat sheet
patrickwalkowicz Sep 15, 2015
e257c6b
Merge pull request #54 from patrickwalkowicz/master
NataliaLKB Sep 15, 2015
ce84e84
adding step numbers to instructions
Jbarget Sep 27, 2015
6dfd223
Merge pull request #62 from Jbarget/adding-numbered-steps
NataliaLKB Sep 27, 2015
91ddd8c
updated the cheatsheet
Jwhiles Oct 7, 2016
6e6eb56
remove content covered in prereqs, precourse & research topics
jsms90 Feb 20, 2017
2474b2d
fix bullet points in contents
jsms90 Feb 20, 2017
e6a6ef5
correct formatting issues & change wording to be appropriate for curr…
jsms90 Feb 20, 2017
c9a5b05
update intro
jsms90 Feb 20, 2017
5dfc90d
Merge pull request #67 from Jwhiles/update-cheatsheet
NataliaLKB Feb 20, 2017
d757be5
Fix typo
PiotrBerebecki Feb 20, 2017
72679e9
Fix a command
PiotrBerebecki Feb 20, 2017
242f471
Fix typ: changes -> change
PiotrBerebecki Feb 20, 2017
d338227
Merge pull request #6 from PiotrBerebecki/master
jsms90 Feb 20, 2017
d4e7231
adding new command in the cheatsheet
smarthutza Feb 21, 2017
2197e11
Merge pull request #14 from smarthutza/update-cheatsheet
jsms90 May 27, 2017
d8c629c
reintroduce Committing section
jsms90 May 27, 2017
009dfb8
Merge pull request #18 from foundersandcoders/reintroduce-committing-…
jsms90 May 27, 2017
27a7d4b
merge Martha & John's additions to the cheatsheet
jsms90 May 27, 2017
a8733d3
add 'Committing' section to contents
jsms90 May 27, 2017
1d57a76
reword requests for students to make PRs & remove mention of jsms90
jsms90 May 27, 2017
1f6e09b
improve explanation in github flow section
jsms90 May 27, 2017
66fe50f
break up the github flow paragraph & make the instruction to follow t…
jsms90 May 27, 2017
991f95e
add links to the github flow section
jsms90 May 29, 2017
f2a37a3
Merge pull request #77 from foundersandcoders/master
NataliaLKB May 29, 2017
9977598
deleted conficts
Jul 7, 2021
d0c0bf9
once again
Jul 7, 2021
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
Loading