BRANCH_INFO.txt

2020.1025
on lunaria
created pre-gitlab branch
the copy here was last synced :

commit e3bd18e84db82bf7e806163194982b901fd5d362
Author: tin6150 <tin6150@gmail.com>
Date:   Sun Sep 27 12:11:58 2020 -0700

    Summary of parallelism avail in R.  secion on Rdsm.

https://docs.gitlab.com/ee/user/project/pages/introduction.html#gitlab-pages-requirements
hoping to have a gitlab-ci.yml that create pages and access as
https://tin6150.gitlab.io/psg/


~~~~

there are several branches, they are for:


*sigh*   github.io pages will only build against master branch
so will merge sansDropSync back into master.
perhaps mark it with some release tag...

so, attempted to merge sansDropSync with master via

git checkout sansDropSync
git merge -s ours -m "..."   origin/master
	# which should just take all the content of sansDropSync and make it the content of the branch master
	# but things are not showing up.
	# git checkout master
	# will revert to previous changes
# made changes to BRANCH_INFO.txt in sansDropSync branch
git commit -a -m "update BRANCH_INFO after merged sansDropSync w/ master"
	# hope this seals the merge!

something isn't right... maybe previous attempts to remove master massed things up royally...

git log --oneline --graph --decorate

* 0f2bdab (HEAD -> sansDropSync, origin/sansDropSync, origin/HEAD) update BRANCH_INFO after merged sansDropSync w/ master
*   74ef5bd merge sansDropSync(ours) back into master(theirs) as need to be in master to get github.io build.  done as git merge -s ours ... origin/master
|\
| * bfc4a75 (tag: v0.2, origin/master, master) rename master branch to masterIwas.  marking its abandonment.  sorry Yoda :)


yet github graphics have master moving down to the branch of sansDropSync...  
not sure what's going on...

end up using github webtgui, created a pull request, 
base: master compare: sansDropSync.
merge pull req

on the web gui graph looks better.  but 
git log --oneline --graph --decorate
in the sansDropSync branch is still weired, lagging one commit behind master.
but desired changes in master, and that's the branch to use, so can ignore those weird issues.
maybe it is all just a presentation of how they have parsed the git db info...



sansDropSync : 	stop using dropbox sync in this branch.
		moba, cygwin, mingw64, really messy
		diff uid, permission don't match, CRLF... 
		that's why real developer hate windows :(
		git remote add origin https://tin6150@github.com/tin6150/psg.git
		DIR: /cygdrive/c/tin-gh/psg

masterIwas :
master :	will abandone this branch.  it was done while using dropbox sync, which was messy.
		was going to rename this to masterIwas
		can rename locally, but not on origin :(
		even tried 
			git push -f origin :master
		gave up renaming.  will just make sandDropSync default chckout/clone  
		http://stackoverflow.com/questions/1526794/rename-master-branch-for-both-local-and-remote-git-repositories?answertab=votes#tab-top		


droboxUrl : 	prior to using github, page doc URL used dropbox  URL like
		https://dl.dropboxusercontent.com/u/31360775/psg/sourceControl.html
		this branch was created before adopting github.io as doc URL
		this branch would likely be a deadend/abandone branch

snap20161016 : 	a snapshot taken in oct, mostly for backup purpose
		no further dev on this branch



commands used to create the dropboxUrl branch:
git branch dropboxUrl
git branch --edit-description dropboxUrl
# added description inside EDITOR, but don't know how to see it

git checkout dropboxUrl
git add BRANCH_INFO.txt
git commit -m "marker for dropboxUrl branch"
git push --set-upstream origin dropboxUrl


## git branch state prior to this commit
  $ git branch -vv
  dropboxUrl   d3e4692 [origin/dropboxUrl] marker (2) for dropboxUrl branch
  * master       2b6e82e [origin/master] adding google_tracking file
  snap20161016 1a66ca2 added progit ref