[Cuis-dev] issues with git. Different branches ?

[Nicola Mingotti]

Ohoho, I discovered the the change is probably not on Cuis side !

I just upgraded the system, sorry, probably my git is not exactly the
same as before.


bye
Nicola



On 8/20/21 11:08 AM, Nicola Mingotti wrote:
> Hi guys,
>
> Git does not behave as usual. Excuse my git naivety. I don't know what 
> to do.
>
> Consider several people who does not know well git are going to try Cuis.
>
> It would be better if it was possible never to see mysterious
> messages while installing following the standard procedure.
> Since i am ignorant on this side, i don't know if it is feasible.
>
> $> ./pullAllRepos
>
>
> ---------------
> ....
> ....
> Pulling  =====Cuis-Smalltalk-Dev=====
> hint: Pulling without specifying how to reconcile divergent branches is
> hint: discouraged. You can squelch this message by running one of the 
> following
> hint: commands sometime before your next pull:
> hint:
> hint:   git config pull.rebase false  # merge (the default strategy)
> hint:   git config pull.rebase true   # rebase
> hint:   git config pull.ff only       # fast-forward only
> hint:
> hint: You can replace "git config" with "git config --global" to set a 
> default
> hint: preference for all repositories. You can also pass --rebase, 
> --no-rebase,
> hint: or --ff-only on the command line to override the configured 
> default per
> hint: invocation.
> Already up to date.
> Repository SVG not cloned
> Repository EnhancedText not cloned
> Repository Erudite not cloned
> Repository St
> -------------
>
> bye
> Nicola
>
>
>
>
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.cuis.st/mailman/archives/cuis-dev/attachments/20210820/61f7cd31/attachment.htm>