Github and me

[Uncle Buddy]

I'll use this thread to leave notes about github.com commits. I make local commits every day but have only needed to refer to a git rollback once. I'm doing the repo for practice in case a team ever comes together. My real rollbacks are manifold and redundant, all local, so normally I don't need to git rollback and don't know how to.

The commit I made to the public repo today is not a functional, coherent whole. That should be coming along in a few weeks hopefully. I've decided to plan on smaller branches and more frequent commits and will announce it here when any public commit is placing a new, coherent working model of the app on the repo. Ignore today's commit, it was just to clear the air as I'd been working on a branch way too long.

The next post will be a copy of the document I look at when I make commits, local and public, and when I merge and check out branches.

[Uncle Buddy]

This is everything I do with git:

git_how_to_basic

in the example, `kin` is a sample branch name and `kin_parents` is the next branch after it
this is using the BASH terminal

according to the instructions in Corey Schafer's YouTube video tutorial

This is a copy of my notes with today's comments in ().
The part I use all the time is between the ****** and the *****.

NOTES
local only or already cloned
cd to local repo
git init
touch .gitignore
add /node_modules to ignore (re: electron project--there was a big pile of node.js stuff to not put in repo)

start 15:00 clone first
git clone https://github... .git .
The dot is the current dir ie `cwrwgl` and has to be empty.

(see below for the whole routine--this is included below--just make sure you're not making
any changes in the master branch... below assumes you've already done this:)
git branch kin
git checkout kin
[Then make changes, add, commit, pull, push]

******** this is the full routine in order except creating the repo which is above*********

(when ready to make a commit to the github repo:)
git branch -a [to list branches]
git push -u origin kin (push local branch to github)

[merging branch:]
git checkout master
[in case your or others made any changes to master branch]
git pull origin master
git branch --merged
git merge kin
git push origin master
git branch --merged
git branch -d kin [this will delete the branch locally]
git branch -a
git push origin --delete kin [this deletes branch at github]
git branch -a

(don't make any changes to master branch!!! do all this stuff right now:)
(create and checkout a new branch to work on it locally:)
git branch kin_parents
git checkout kin_parents
(now you're working locally, ok to make any changes, create/move files & folders)

(to make a local commit eg after a feature is done or at end of day:)
git add -A
git commit -m "message"

************************************************************


(this is copied from terminal starting with a local commit to kin and
ending with a checkout to the new current branch kin_parents;
only the part after the $ is what I had to type, the rest is output by git)

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (kin)
$ git add -A

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (kin)
$ git commit -m "new schema findings_persons table & new table persons_persons; dumped .sql text files to etc folder"
[kin 1a5e1a1] new schema findings_persons table & new table persons_persons; dumped .sql text files to etc folder
10 files changed, 4390 insertions(+), 913 deletions(-)
delete mode 100644 app/python/numerology_001.py
delete mode 100644 app/python/treebard_root_024.py
create mode 100644 etc/default_new_tree_untouched.sql
create mode 100644 etc/sample_tree.sql

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (kin)
$ git branch -a
* kin
master
remotes/origin/master

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (kin)
$ git push -u origin kin
Enumerating objects: 450, done.
Counting objects: 100% (450/450), done.
Delta compression using up to 6 threads
Compressing objects: 100% (414/414), done.
Writing objects: 100% (414/414), 181.86 KiB | 2.53 MiB/s, done.
Total 414 (delta 266), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (266/266), completed with 28 local objects.
remote:
remote: Create a pull request for 'kin' on GitHub by visiting:
remote: github.com/ProfessorUdGuru/treebard_gps/pull/new/kin
remote:
To github.com/ProfessorUdGuru/treebard_gps.git
* [new branch] kin -> kin
Branch 'kin' set up to track remote branch 'kin' from 'origin'.

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (kin)
$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git pull origin master
From github.com/ProfessorUdGuru/treebard_gps
* branch master -> FETCH_HEAD
Already up to date.

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git branch --merged
* master

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git merge kin
Updating c61e4ac..1a5e1a1
Fast-forward
README.md | 4 +-
app/python/autofill.py | 17 +-
app/python/colorizer.py | 1071 ++++--
app/python/custom_combobox_widget.py | 157 +-
app/python/custom_tabbed_widget.py | 3 +
app/python/dates.py | 54 +-
app/python/dropdown.py | 15 +-
app/python/events_table.py | 212 +-
app/python/families.py | 1162 ++++++
app/python/font_picker.py | 4 +-
app/python/gallery.py | 14 +-
app/python/main.py | 179 +-
app/python/messages.py | 100 +-
app/python/messages_context_help.py | 30 +-
app/python/names.py | 147 +-
app/python/nested_place_strings.py | 3 +-
app/python/notes.py | 35 +-
app/python/opening.py | 17 +-
app/python/places.py | 18 +-
app/python/query_strings.py | 556 ++-
app/python/roles.py | 15 +-
app/python/scrolling.py | 32 +-
app/python/search.py | 54 +-
app/python/styles.py | 121 +-
app/python/toykinter_widgets.py | 53 +-
app/python/treebard_root_023.py | 201 -
app/python/treebard_root_025.py | 366 ++
app/python/widgets.py | 158 +-
app/python/window_border.py | 36 +-
data/settings/treebard.db | Bin 28672 -> 28672 bytes
etc/default_new_tree.sql | 292 +-
etc/default_new_tree_untouched.sql | 362 ++
...blank_birth_event_for_everyone_if_not_exists.py | 530 +++
etc/restore_default_color_schemes.py | 86 +
etc/sample_tree.sql | 3853 ++++++++++++++++++++
etc/treebard.sql | 4 +-
36 files changed, 8494 insertions(+), 1467 deletions(-)
create mode 100644 app/python/families.py
delete mode 100644 app/python/treebard_root_023.py
create mode 100644 app/python/treebard_root_025.py
create mode 100644 etc/default_new_tree_untouched.sql
create mode 100644 etc/insert_blank_birth_event_for_everyone_if_not_exists.py
create mode 100644 etc/restore_default_color_schemes.py
create mode 100644 etc/sample_tree.sql

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git push origin master
Total 0 (delta 0), reused 0 (delta 0), pack-reused 0
To github.com/ProfessorUdGuru/treebard_gps.git
c61e4ac..1a5e1a1 master -> master

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git branch --merged
kin
* master

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git branch -d kin
Deleted branch kin (was 1a5e1a1).

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git branch -a
* master
remotes/origin/kin
remotes/origin/master

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git push origin --delete kin
To github.com/ProfessorUdGuru/treebard_gps.git
- [deleted] kin

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git branch -a
* master
remotes/origin/master

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git add -A

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git commit -m "this is a blank commit"
On branch master
Your branch is up to date with 'origin/master'.

nothing to commit, working tree clean

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git pull origin master
From github.com/ProfessorUdGuru/treebard_gps
* branch master -> FETCH_HEAD
Already up to date.

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git push origin master
Everything up-to-date

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git branch kin_parents

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (master)
$ git checkout kin_parents
Switched to branch 'kin_parents'

Lutherman@DESKTOP-E4HPS16 MINGW64 /d/treebard_gps (kin_parents)

+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
EXTRA CREDIT: after having problems due to not gitignoring my SQLite files:
to force github to stop tracking db: make all commits first...
git checkout master
git rm -r --cached .
git add .
git commit -m "fixed untracked files"
THEN replace folders/files which github removed from My Computer
[to prevent this, don't track binary files like .db--use SQLite's .sql file extension to .dump... see instructions in
the `etc` folder so github can have a copy of the db but in flat form which can be imported
by someone who wants to create a copy of the .db... or just email/dropbox the .db.]