[Radiance-general] Evalglare doesn't seem to have made it over to github

[Tim Perry]

Just remember git is a directed cyclical graph and you'll get pretty
far.... The Atlasssian tutorials are pretty helpful with diagrams and
pictures to go with descriptions of the commands. Here are some docs to
help you:

synching your dev tree
https://www.atlassian.com/git/tutorials/syncing

what does rebase do?
https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

Should I merge or rebase?
https://www.atlassian.com/git/articles/git-team-workflows-merge-or-rebase/

Stashing changes in git:
https://git-scm.com/book/no-nb/v1/Git-Tools-Stashing

It is hard to give specified advice on how to sync up your environment with
the code line from github without knowing the specifics of everything you
have done locally. But, to answer your questions, assuming you have
un-commited changes on your branch, you *probably* need:

git stash
git fetch
git rebase
git stash pop

If you don't have uncommitted (to your local repository) changes, you can
skip the stash commands and *probably* just do:

git fetch
git rebase


Note the *probably*. This may not be the correct sequence for your
situation.


Good luck!
Tim



On Mon, Feb 8, 2016 at 10:46 PM, Randolph M. Fritz <rmfritz3 at gmail.com>
wrote:

> Seems if I follow "git clone https://github.com/NREL/Radiance/" with "git
> checkout combined" that does the job. How I would merge my local "combined"
> branch with the github respository (should I have changes and the
> permission to merge them) I don't understand, but then there's lots of
> things about git I don't understand.
>
> (And I suppose we ought to move this discussion to the development list,
> bah!)
> --
> Randolph
>
> On Mon, Feb 8, 2016 at 7:55 PM, Randolph M. Fritz <rmfritz3 at gmail.com>
> wrote:
>
>> Oh, I see. I did the regular generic github download and got the wrong
>> branch.
>>
>> Why is "master" so far out of date?
>> On Feb 8, 2016 7:46 PM, "Guglielmetti, Robert" <
>> Robert.Guglielmetti at nrel.gov> wrote:
>>
>>> To be clear Randolph, the "combined" branch is the one that's kept up to
>>> date with the CVS repository. Branch "master" is ancient. As the link
>>> Nathaniel posted shows, the combined branch has the evalglare source, and
>>> the CMake files include it in the build and package targets:
>>>
>>>
>>> https://github.com/NREL/Radiance/blob/combined/src/util/CMakeLists.txt#L101-L104
>>>
>>> Matter of fact (file under: I love GitHub):
>>>
>>>
>>> https://github.com/NREL/Radiance/commit/dde95dd17644c0fe8e6849ded9ee48498a5487ba
>>>
>>> - Rob
>>>
>>>
>>>
>>> On 2/8/16, 8:18 PM, "Rob Guglielmetti" <rob.guglielmetti at gmail.com
>>> <mailto:rob.guglielmetti at gmail.com>> wrote:
>>>
>>> Yeah, whatcha talking about?
>>>
>>> On Mon, Feb 8, 2016 at 7:03 PM, Randolph M. Fritz <rmfritz3 at gmail.com
>>> <mailto:rmfritz3 at gmail.com>> wrote:
>>> What's up with this?
>>>
>>> --
>>> Randolph M. Fritz, Lighting Design and Simulation
>>> +1 206 659-8617<tel:%2B1%20206%20659-8617> || rmfritz3 at gmail.com<mailto:
>>> rmfritz3 at gmail.com>
>>>
>>> _______________________________________________
>>> Radiance-general mailing list
>>> Radiance-general at radiance-online.org<mailto:
>>> Radiance-general at radiance-online.org>
>>> http://www.radiance-online.org/mailman/listinfo/radiance-general
>>>
>>>
>>>
>>> _______________________________________________
>>> Radiance-general mailing list
>>> Radiance-general at radiance-online.org
>>> http://www.radiance-online.org/mailman/listinfo/radiance-general
>>>
>>
>
> _______________________________________________
> Radiance-general mailing list
> Radiance-general at radiance-online.org
> http://www.radiance-online.org/mailman/listinfo/radiance-general
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.radiance-online.org/pipermail/radiance-general/attachments/20160208/04c23343/attachment.html>