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

Jump to bottom

Merging experiments #84

Open
wants to merge 64 commits into
base: merging-experiments
Choose a base branch
from
Open

Merging experiments #84

wants to merge 64 commits into from

Conversation

TomaszWojtyniak
Copy link

No description provided.

NataliaLKB and others added 30 commits March 31, 2015 15:13
@NataliaLKB
updating images and links
03b06bf
@NataliaLKB
updating resources anchor
c1cd612
@NaomiGaynor
adds git-status image
7efa9a5
@NaomiGaynor
adds instructions to redirect into directory created by git clone com…
5e25f03 
…mand
@NaomiGaynor
corrects typo
d2d53c1
@NataliaLKB
Merge pull request #1 from NaomiGaynor/tutorial-edits
e095b07 
Tutorial edits
@NataliaLKB
adding merge commits section
022ad86
@NataliaLKB
merging with remote changes
b15f860
@NataliaLKB
updating merge-conflict images
f29c7aa
@NataliaLKB
replacing PR with Pull request to make it more consistent
f6829a4
@NataliaLKB
adding further description of origin
eacc347
@NataliaLKB
embelishing the message section about commits to include how you get …
c281ead 
…out of vim
@NataliaLKB
describing more clearly what happens on a git push based on NataliaLKB#2
1e1d465
@NataliaLKB
Merge pull request NataliaLKB#3 from NataliaLKB/minor-additions
949a2a6 
Minor additions
@NataliaLKB
deleting duplicate instructions
492eb9b
@NataliaLKB
Merge pull request NataliaLKB#4 from NataliaLKB/minor-additions
e7edd79 
deleting duplicate instructions
@NataliaLKB
Making the commit message guidelines into bullet points for quick rea…
34bc9d5 
…ding
@NataliaLKB
Merge pull request NataliaLKB#5 from NataliaLKB/aesthetics
b63a144 
Making the commit message guidelines into bullet points for quick readin...
@NataliaLKB
fixing spelling error in commit messages section
abc94e4
@NataliaLKB
braking up detached state paragraph into smaller sections
1116839
@NataliaLKB
changed description of tutorial for full time students, to just stude…
391fe98 
…nts of FAC
@NataliaLKB
changing initial git branch new-branch to `git branch my-new-branch…
4e6113c 
…` for clarity
@NataliaLKB
Merge pull request NataliaLKB#26 from NataliaLKB/semantics
9983116 
Semantics
@NataliaLKB
fixing typos mentioned in NataliaLKB#13
16f2915
@NataliaLKB
fixing git-for-collaboration link problem mentioned in NataliaLKB#19
5d7deb4
@NataliaLKB
Merge pull request NataliaLKB#27 from NataliaLKB/typos
0b2e226 
Typos
@NataliaLKB
Revert "Typos"
642a8f2
@NataliaLKB
Merge pull request NataliaLKB#28 from NataliaLKB/revert-27-typos
09c330d 
Revert "Typos"
@NataliaLKB
fixing small typos mentionedi in 19
8428c10
@NataliaLKB
Merge pull request NataliaLKB#29 from NataliaLKB/typos
8bec538 
fixing small typos mentionedi in 19
Rafe Kennedy and others added 30 commits May 4, 2015 11:36
makes name of new branch in ###Branching consistent
972c4e5
@NataliaLKB
Merge pull request NataliaLKB#33 from rjmk/branch-naming
94b3259 
makes name of new branch in ###Branching consistent
@patrickwalkowicz
Added a section on changing file structure
65f829d
@patrickwalkowicz
Added git mv command in cheat sheet
306ed7a
@NataliaLKB
Merge pull request NataliaLKB#54 from patrickwalkowicz/master
e257c6b 
Added a section on git mv and updated cheatsheet.md accordingly
@Jbarget
adding step numbers to instructions
ce84e84
@NataliaLKB
Merge pull request NataliaLKB#62 from Jbarget/adding-numbered-steps
6dfd223 
adding step numbers to instructions
@Jwhiles
updated the cheatsheet
91ddd8c
@jsms90
remove content covered in prereqs, precourse & research topics
6e6eb56
@jsms90
fix bullet points in contents
2474b2d
@jsms90
correct formatting issues & change wording to be appropriate for curr…
e6a6ef5 
…ent cohort
@jsms90
update intro
c9a5b05
@NataliaLKB
Merge pull request NataliaLKB#67 from Jwhiles/update-cheatsheet
5dfc90d 
updated the cheatsheet
@PiotrBerebecki
Fix typo
d757be5
@PiotrBerebecki
Fix a command
72679e9
@PiotrBerebecki
Fix typ: changes -> change
242f471
@jsms90
Merge pull request NataliaLKB#6 from PiotrBerebecki/master
d338227 
Fix spelling
@smarthutza
adding new command in the cheatsheet
d4e7231
@jsms90
Merge pull request NataliaLKB#14 from smarthutza/update-cheatsheet
2197e11 
adding new command in the cheatsheet
@jsms90
reintroduce Committing section
d8c629c 
relates #1
@jsms90
Merge pull request NataliaLKB#18 from foundersandcoders/reintroduce-c…
009dfb8 
…ommitting-section

reintroduce Committing section
@jsms90
merge Martha & John's additions to the cheatsheet
27a7d4b
@jsms90
add 'Committing' section to contents
a8733d3 
relates #1
@jsms90
reword requests for students to make PRs & remove mention of jsms90
1d57a76
@jsms90
improve explanation in github flow section
1f6e09b 
relates NataliaLKB#74
@jsms90
break up the github flow paragraph & make the instruction to follow t…
66fe50f 
…he link much clearer

relates NataliaLKB#74
@jsms90
add links to the github flow section
991f95e 
relates NataliaLKB#74
@NataliaLKB
Merge pull request NataliaLKB#77 from foundersandcoders/master
f2a37a3 
updates based on the forked version that was delivered for week 1 of FAC10
deleted conficts
9977598
once again
d0c0bf9
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@TomaszWojtyniak @NataliaLKB @NaomiGaynor @nelsonic @patrickwalkowicz @Jbarget @Jwhiles @jsms90 @PiotrBerebecki @smarthutza