issues:add in list #3009,#3010, correction blank in #3011

[harrykar]

What does this PR do?

Add Resource(s) | Improve Repo

For resources

Description

added:
Object-oriented Programming in JavaTM Textbook by Rick Halterman #3009
Introduction to Computer Science by Robert Sedgewick and Kevin Wayne. #3010
corrected:
link not displayed correctly(displayed with makdown)
deleted blanc ...Problem Solving] (https://archive.... in Java, Java, Java Object-Oriented Problem Solving by R. Morelli and R.Walde #3011

Why is this valuable (or not)

Knowledge is ever valuable

How do we know it's really free?

Source are accademic Websites

For book lists, is it a book?

Checklist:

• [x ] Not a duplicate
• [ x] Included author(s) if appropriate
• [x ] Lists are in alphabetical order
• [ x] Needed indications added (PDF, access notes, under construction)

[harrykar]

I did all correct dunno why that conflict. Someone from staff need here i guess

[eshellman]

To avoid merge conflicts, always pull changes from the source before committing.

[eshellman]

Also, the "staff" is you, and a thousand others! (In this case, the problem was I messed up the revert.)

[harrykar]

To avoid merge conflicts, always pull changes from the source before committing.

I guess more users are afraid of git cause it's initial high step learn curve
Ok let's do a bit of git school not only for me but for others too

1. as you have mentioned first of all we need do a pull from the source centralized repo to get all changes others did meanwhile we was not connected to the central repo but for me the problem was
   1.a. i had forked the central/source repo and i have (more than one time) requested here how i can update the fork(after i did the first PR) but i had get no answer. I had to search some resources(Note: was useful to update Howto contribute with a more concrete tutorial) to find that synthesized(by me) solution

a. Add the central/source repo to our local repo(cloned from the fork )
$ git remote add upstream git@github.com:EbookFoundation/free-programming-books.git
Now we've our forked(origin) , local, and central(upstream) repo

$ git remote -v
origin	git@github.com:harrykar/free-programming-books.git (fetch)
origin	git@github.com:harrykar/free-programming-books.git (push)
upstream	git@github.com:EbookFoundation/free-programming-books.git (fetch)
upstream	git@github.com:EbookFoundation/free-programming-books.git (push)

b. We have to move to our local master branch(in case we're in another branch)

$ git checkout master
Switched to branch 'master'

c. fetch updates from the central/source(upstream remote) repository into our local(cloned from fork) repo.

$ git fetch upstream
remote: Enumerating objects: 40, done.
remote: Counting objects: 100% (40/40), done.
remote: Compressing objects: 100% (16/16), done.
remote: Total 44 (delta 27), reused 35 (delta 24), pack-reused 4
Unpacking objects: 100% (44/44), done.
From github.com:EbookFoundation/free-programming-books
 * [new branch]      close-2491 -> upstream/close-2491
 * [new branch]      deprecate-javascript-pages -> upstream/deprecate-javascript-pages
 * [new branch]      eshellman-patch-1 -> upstream/eshellman-patch-1
 * [new branch]      how-to     -> upstream/how-to
 * [new branch]      master     -> upstream/master
 * [new branch]      open-source-ecosystem -> upstream/open-source-ecosystem
 * [new branch]      reformat-screan-pod-casts -> upstream/reformat-screan-pod-casts
 * [new branch]      remove-frameworks-pt-BR -> upstream/remove-frameworks-pt-BR
 * [new branch]      requested-emails -> upstream/requested-emails
 * [new branch]      revert-3021-master -> upstream/revert-3021-master
 * [new branch]      standardize-wikibooks -> upstream/standardize-wikibooks

Let's do a glance in our branches in all our (forked(origin) , local, and central(upstream) ) repos

$ git branch -va
  harrykar                                    9ca0f12 issues:add in list #3009,#3010, correction blank in #3011
* master                                      9ca0f12 issues:add in list #3009,#3010, correction blank in #3011
  remotes/origin/HEAD                         -> origin/master
  remotes/origin/close-2491                   5a1a911 add princeton algorithms
  remotes/origin/deprecate-javascript-pages   6a461e9 deprecate the javascript frameworks pages
  remotes/origin/eshellman-patch-1            20b37e4 remove js framework link
  remotes/origin/how-to                       8e35929 add resource titles and delint
  remotes/origin/master                       9ca0f12 issues:add in list #3009,#3010, correction blank in #3011
  remotes/origin/open-source-ecosystem        66ad3ec Open source ecosystem
  remotes/origin/reformat-screan-pod-casts    52c0239 trial and error
  remotes/origin/remove-frameworks-pt-BR      0b66ec3 move js resources into books or casts as appropriate
  remotes/origin/requested-emails             6f25b36 remove dead link
  remotes/origin/standardize-wikibooks        5047c7f Merge branch 'master' into standardize-wikibooks
  remotes/upstream/close-2491                 5a1a911 add princeton algorithms
  remotes/upstream/deprecate-javascript-pages 6a461e9 deprecate the javascript frameworks pages
  remotes/upstream/eshellman-patch-1          20b37e4 remove js framework link
  remotes/upstream/how-to                     8e35929 add resource titles and delint
  remotes/upstream/master                     f50175e Revert 3021 master (#3025)
  remotes/upstream/open-source-ecosystem      66ad3ec Open source ecosystem
  remotes/upstream/reformat-screan-pod-casts  52c0239 trial and error
  remotes/upstream/remove-frameworks-pt-BR    0b66ec3 move js resources into books or casts as appropriate
  remotes/upstream/requested-emails           6f25b36 remove dead link
  remotes/upstream/revert-3021-master         eaadb3a remove space, readd javajavajava
  remotes/upstream/standardize-wikibooks      5047c7f Merge branch 'master' into standardize-wikibooks

d. time to incorporate the central/source repo's changes to our local repo(make sure you're in master branch). After that operation the two repos have to be synchronized
Here i notice one can use merge or rebase. I use rebase that time because of the more linear history

$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: issues:add in list #3009,#3010, correction blank in #3011
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging free-programming-books.md

e. The final step is update our fork from our local repo

$git push origin master
To git@github.com:harrykar/free-programming-books.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:harrykar/free-programming-books.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes before pushing again.  See the 'Note about
fast-forwards' section of 'git push --help' for details.

the push is rejected we've use th -f (force) flag

$ git push -f origin master
Counting objects: 26, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (22/22), done.
Writing objects: 100% (22/22), 3.14 KiB, done.
Total 22 (delta 16), reused 0 (delta 0)
remote: Resolving deltas: 100% (16/16), completed with 4 local objects.
To git@github.com:harrykar/free-programming-books.git

• 46876e2...6807a45 master -> master (forced update)

Finally now after have updated our remote origin (fork) with the latest changes of the remote upstream (the source/central repository) trough our local cloned(from the remote origin) repository we can continue to collaborate further

[harrykar]

Also, the "staff" is you, and a thousand others! (In this case, the problem was I messed up the revert.)

Yeah i know so let's say "staff" is who is more experienced and can help others :)

[eshellman]

I use the github desktop app and resort to the command line only when doing brain surgery. you just need to alphabetize the list

[harrykar]

I use the github desktop app and resort to the command line only when doing brain surgery. you just need to alphabetize the list

First all first in https://desktop.github.com/ i can't find a package for linux if i don't miss something;On one hand that's not good(divide trough users of different OS's?!) but as usual i have to go further trough the CLI after all git is a CLI tool. Actually i feel comfortable with my geany editor + his incorporated shell plugin

Pull Requests can be made also trough CLI by hub (a github's git wrapper tool) that have to be downloaded and "installed" locally but for now i use the browser for that

[harrykar]

Can I write a short tutorial on how collaborate here trough git's CLI usage in a sticky place (Wiki? ) here? I guess would be useful for other beginner *nix users too

[eshellman]

The wiki on this repo hasn't been added to in 4 years!, but feel free to either

1. add to the wiki (let me know if you need permissions)
2. write a tutorial on your own wiki and link to is from CONTRIBUTING.md
3. write a tutorial page and propose adding it to the repo in a PR.

I expect you'll want help with editing - request help in an issue.

[harrykar]

There's no wiki on this repo, but feel free to either

That's not a wiki?
https://github.com/EbookFoundation/free-programming-books/wiki

[eshellman]

So there is! See my modified comment - I'll create a wiki team and add you if needed.

[harrykar]

Thanks @eshellman
I guess the most appropriate place and way of the three proposed is the No 2. but Central repo's Wiki (if am I not wrong Wiki is tracked too )

I already posted the first draft (i guess what is written is almost ready as it is except of language errors -I'm not a native English-) take a look at and let me know

I guess when ready(miss the collaborating part i.e. howto change master-collaboration branch, add the book in the ordered list and send it to central repo trough PR, GUI visualizzation history tools, etc) the wiki page have to be linked to the main page

[eshellman]

Check Travis output to see how to satisfy the linter

[eshellman]

This "booksite" is not the book. We can include it if you think it's still useful, but should add a notation.

[harrykar]

Nowadays Books exists in some formats. This web page IS the book (in HTML form hence the (HTML) instead of (PDF) or (OTHER FORMAT)).
The exact same book is available in Amazon in printed form. Whereas the book in HTML form is Open thanks to Sedgewick & Wayne.
The book(contents) are awesome in my humble opinion

[harrykar]

By the way i have a question about that use case
Suppose there is an author's page in which other than the author's textbook refer other useful in formations like exercises other subject matter related links bibliography etc
In that case IMHO is more useful/valuable refer in the books list the author's page(that contains the author's PDF) than the author's textbook link
Such typical use cases are Uni's profs pages

[eshellman]

We have lots of HTML websites-as-books. This isn't one of those. Its a free-website-to-go-with-book-that-you've-bought. Nothing wrong with that, but it's not the not-free-book-that-you-buy.

[eshellman]

We often link to a book webpage where links to the book file are presented along with related material.

[harrykar]

We have lots of HTML websites-as-books. This isn't one of those.

Right now i am in house and have the book at hand. I was pretty sure about that. I can assure you that page is exactly the book and to be more precise in their page the subject matter is much more better organized than in printed form. What's the reason you assert the opposite? have you observed some change somewhere in their webpage?

Its a free-website-to-go-with-book-that-you've-bought. Nothing wrong with that, but it's not the not-free-book-that-you-buy.

I know the sort of pages you refer but the page under question isn't

[harrykar]

We often link to a book webpage where links to the book file are presented along with related material.

That's the right thing i guess 👍

[eshellman]

Look at other bookboon links to see the notation we require.

[harrykar]

", Bookboon. (email address requested, not required)" added it too.

[eshellman]

Alphabetization: "Object " < "Object-"

[harrykar]

LOL seems tough. Hope there's an automa that can give us all that error indications

[eshellman]

There is. It's Travis. Click on "details"

continuous-integration/travis-ci/pr — The Travis CI build failed Details

[harrykar]

There is. It's Travis. Click on "details"

continuous-integration/travis-ci/pr — The Travis CI build failed Details

Sorry the silliness I can't see a details button where is it?
in that page somewhere between our conversations i see

harrykar and others added some commits 8 days ago
harrykar
issue #3011 Java, Java, Java Object-Oriented Problem Solving by R. Mo…
e10717d
@eshellman
harrykar
Revert 3021 master (#3025)
f7d7261
harrykar
issues:add in list #3009,#3010, correction blank in #3011
227a313
harrykar
issue #3011 Java, Java, Java Object-Oriented Problem Solving by R. Mo…
45ad31c
harrykar
add 2 books, create [Eiffel](#eiffel),
898d962
harrykar
correct merge annotations floated around
166fb2a
harrykar
correct add one blankline before ### Subversion
1d291eb

the last part of every line is a SHA1 and is a link you mean that one?

[harrykar]

Don't mind I found it :) and yes is the same page as when i clicked on sha1 link (i referred earlier)

[eshellman]

Add pdf notation

[harrykar]

ok
Thanks for your patience and support eshell really appreciate hope to return back partly

[harrykar]

Uffa!! After dunno how many 6-7 continuous cycles of edit>add>commit>squash>push >PR's>Travis linter indications finally I was successful ; Thanks God I hadn't compile also the PR's form (@eshellman curiosity: how was i freed from that constriction? )
GREAT :D

PS> Great git practice/school here I devised a nice bi-command for squash to insert also in tutorial' I put it here in case i forget about it

git reset --soft HEAD~<number of commits to squash> 
git commit 

[eshellman]

Thanks for persisting!

[harrykar]

Thanks for persisting!

Really Thanks to you for your inspiration, patience & help. Nice management work ;)

About Git's tutorial i thought for an average reader was irritating read something relatively quite important here but half-made(cause my other daily activities) so i guess was a good idea if temporarily -time to finish it- moved that work to my blog and meanwhile put here a link in case someone altogether was interested ; what do you think?

[harrykar]

@eshellman added clarification to title so folks don't think it's the book.

I have explained my point(i feel a bit silly repeat that the site's content is a -better organized- copy of the printed book or the other way around) in an earlier(revised) post but maybe I miss something. My question is for the next time i likely meet that case ; what is the difference between a "booksite" and a book structured as a set of webpages(i call it HTML book for easy reference)? if it's possible trough a concrete example with 2-3 example links

[harrykar]

Strange conflict
Today after a brand fresh git fetch upstream i face a conflict the first one(see below) sounds pretty strange to me

harrykar@harrysas:~/git_repos/free-programming-books$ git status 
# On branch master
nothing to commit (working directory clean)

harrykar@harrysas:~/git_repos/free-programming-books$ git fetch upstream
remote: Enumerating objects: 9, done.
remote: Counting objects: 100% (9/9), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 9 (delta 3), reused 2 (delta 2), pack-reused 0
Unpacking objects: 100% (9/9), done.
From github.com:EbookFoundation/free-programming-books
   1180056..35b7d17  master     -> upstream/master

harrykar@harrysas:~/git_repos/free-programming-books$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: issue #3011 Java, Java, Java Object-Oriented Problem Solving by R. Morelli and R.Walde
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging free-programming-books.md
Applying: issues:add in list #3009,#3010, correction blank in #3011
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging free-programming-books.md
CONFLICT (content): Merge conflict in free-programming-books.md
Recorded preimage for 'free-programming-books.md'
Failed to merge in the changes.
Patch failed at 0002 issues:add in list #3009,#3010, correction blank in #3011

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

harrykar@harrysas:~/git_repos/free-programming-books$ git status 
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      free-programming-books.md
#
no changes added to commit (use "git add" and/or "git commit -a")

As git indicates in merge(rebasing really) your upstream/master on my local master branch failed' The 2nd fail is :
Patch failed at 0002 issues:add in list #3009,#3010, correction blank in #3011

After searching about conflict annotations ====== <<<<<< in bookslist file
i face a merge conflict and on investigating on it I saw

the first conflict exactly the same as yesterday (lines i deleted yesterday meanwhile i struggled to pass my revision to Travis). How can be possible reface the exact same situation i cured yesterday?
If i deleted that exact lines in the same exact place and commit the corrected revision to upstream(your Central repository) and Travis approve and you integrated my revision on your upstream master who/what have reintroduced again in circulation the bad revision in upstream(Central) repository ?
I can't understand it 👎

Precisely between l.1982-l.1985

<<<<<<< HEAD
=======

>>>>>>> issue #3011 Java, Java, Java Object-Oriented Problem Solving by R. Morelli and R.Walde

the second conflict is clearly caused from your addition; that one can understand it because sounds logic
l.1397 - l.1400

<<<<<<< HEAD
* [Introduction to Computer Science "booksite"](https://introcs.cs.princeton.edu/java/cs/) - by Robert Sedgewick and Kevin Wayne (HTML)
=======
* [Introduction to Computer Science](https://introcs.cs.princeton.edu/java/cs/) - by Robert Sedgewick and Kevin Wayne (HTML)

...and a series of others. All together are reported in my post below (can serve for the tutorial)

[harrykar]

tutorial?! - merge(rebase) conflicts

harrykar@harrysas:~/git_repos/free-programming-books$ git status 
# On branch master
nothing to commit (working directory clean)

harrykar@harrysas:~/git_repos/free-programming-books$ git fetch upstream
remote: Enumerating objects: 9, done.
remote: Counting objects: 100% (9/9), done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 9 (delta 3), reused 2 (delta 2), pack-reused 0
Unpacking objects: 100% (9/9), done.
From github.com:EbookFoundation/free-programming-books
   1180056..35b7d17  master     -> upstream/master

harrykar@harrysas:~/git_repos/free-programming-books$ git rebase upstream/master
First, rewinding head to replay your work on top of it...
Applying: issue #3011 Java, Java, Java Object-Oriented Problem Solving by R. Morelli and R.Walde
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging free-programming-books.md
Applying: issues:add in list #3009,#3010, correction blank in #3011
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging free-programming-books.md
CONFLICT (content): Merge conflict in free-programming-books.md
Recorded preimage for 'free-programming-books.md'
Failed to merge in the changes.
Patch failed at 0002 issues:add in list #3009,#3010, correction blank in #3011

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

harrykar@harrysas:~/git_repos/free-programming-books$ git status 
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      free-programming-books.md
#
no changes added to commit (use "git add" and/or "git commit -a")

after modified(resolved)

harrykar@harrysas:~/git_repos/free-programming-books$ git status 
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      free-programming-books.md
#
no changes added to commit (use "git add" and/or "git commit -a")

Then, tell Git you’re done
resolving the conflict with the git add command:
git add <file>
That’s right; all you have to do is stage the conflicted file to mark it as resolved.

harrykar@harrysas:~/git_repos/free-programming-books$ git add .

harrykar@harrysas:~/git_repos/free-programming-books$ git status 
# Not currently on any branch.
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   free-programming-books.md
#
harrykar@harrysas:~/git_repos/free-programming-books$ 

harrykar@harrysas:~/git_repos/free-programming-books$ git rebase --continue
Applying: issues:add in list #3009,#3010, correction blank in #3011
Applying: Revert 3021 master (#3025)
Applying: issue #3011 Java, Java, Java Object-Oriented Problem Solving by R. Morelli and R.Walde
Applying: add 2 books, create [Eiffel](#eiffel),
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging free-programming-books.md
CONFLICT (content): Merge conflict in free-programming-books.md
Failed to merge in the changes.
Patch failed at 0005 add 2 books, create [Eiffel](#eiffel),

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

harrykar@harrysas:~/git_repos/free-programming-books$ git status 
# Not currently on any branch.
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:      free-programming-books.md
#
no changes added to commit (use "git add" and/or "git commit -a")

harrykar@harrysas:~/git_repos/free-programming-books$ git add .

harrykar@harrysas:~/git_repos/free-programming-books$ git rebase --continue
Applying: add 2 books, create [Eiffel](#eiffel),
Applying: swap l.1413 and l.1412%B
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging free-programming-books.md
CONFLICT (content): Merge conflict in free-programming-books.md
Failed to merge in the changes.
Patch failed at 0006 swap l.1413 and l.1412%B

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

harrykar@harrysas:~/git_repos/free-programming-books$ git add .

harrykar@harrysas:~/git_repos/free-programming-books$ git rebase --continue
Applying: swap l.1413 and l.1412%B
Recorded resolution for 'free-programming-books.md'.

update forked repo

harrykar@harrysas:~/git_repos/free-programming-books$ git push -f origin master
Counting objects: 259, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (162/162), done.
Writing objects: 100% (235/235), 51.22 KiB, done.
Total 235 (delta 158), reused 116 (delta 72)
remote: Resolving deltas: 100% (158/158), completed with 22 local objects.
To git@github.com:harrykar/free-programming-books.git
 + 682c429...6e33375 master -> master (forced update)