Uni lib

[StephenWampler]

Add missing .u files to Makefile, fix typos in complex.icn, extend istype() in predicat.icn to allow testing against a class instance and not just a class name.

(No, I don't know why commit 8d063cd is still in this pull request - I think that change as already been pulled into upstream.)

[Jafaral]

86063cd is there because it does exist on the branch you are pushing from. That commit has to be removed first.

at your end, make sure your repo is up to date:

git fetch --all 

start a new branch off upstream master call the new branch ulib:

git checkout -b ulib upstream/master

bring in only the new commit to the new branch:

git cherry-pick 176d930

Push the new branch to github and open a new PR:

git push -u origin ulib

[StephenWampler]

On 7/7/20 3:06 PM, Jafar Al-Gharaibeh wrote:

86063cd is there because it does exist on the branch you are pushing from. That commit has to be removed first.

at your end, make sure every your repo is up to date:

||

start a new branch off upstream master call the new branch |ulib|:

|git checkout -b ulib upstream/master |

bring in only the new commit to the new branch:

|git cherry-pick 176d930 |

Push the new branch to github and open a new PR:

|git push -u origin ulib |

Thanks Jafar.  I have a question - is there a way to automatically sync origin/master from upstream/master? I'd rather pull from origin/master and push to origin/XXX, but that requires that origin/master always be up-to-date w.r.t. upstream/master.

I know [he claims] how to set a different push url from the pull one.

-- Steve Wampler - sbw@tapestry.tucson.az.us The gods that smiled at your birth are now laughing out loud - fortune cookie

[Jafaral]

@StephenWampler , there is no automatic way to sync up origin/master with upstream/master, here is what I do to sync it up

git fetch --all
git checkout master
git merge upstream/master
git push

However, I rarely do the last step because I don't really care about origin master, what I care about is the local master and upstream master which are covered in the first three steps above. origin which refers to my fork of unicon serves a public repo where I can publish new branches and open PRs against the upstream repo. keeping origin/master in sync really serves no purpose unless you are doing something special using your github repo, and even then, you would probably be doing things on branches other than the master branch.

My workflow usually begins with the first three steps above, then creating a new branch to fix bugs or implement new features. I keep the master branch "clean" and in sync with upstream/master without committing directly to master.

Also, to avoid problems, in addition to keeping your local master clean and in sync with upstream/master, once you push a branch to origin and you open a PR, stop using the same branch for further development. create a new branch off the you local "clean" and synced master and have a fresh start.