[Libre-soc-dev] git guide

[Umberto Cerrato]

> Il giorno 29 mar 2021, alle ore 13:37, Luke Kenneth Casson Leighton <lkcl at lkcl.net> ha scritto:
> 
> On Monday, March 29, 2021, Umberto Cerrato <umbertocerrato at outlook.it>
> wrote:
> 
>> 
>>> # what to do if "git pull" results in conflict
>>> 
>> 
>> I do not know sincerely.
> 
> 
> then what would you do?  if you didn't know, what would you do?

Usually when something happens, I do a search on the web.
It didn’t happen yet to have been stuck there.
(I did check other things though in these two days)

> 
> 
>> ...
>>> ....
>>> 
>>> # what to do if you want to add files.
>>> 
>>> …
>> 
>> Neither this… “git add “ ?
> 
> 
> this is why i asked you to write this page, because "just git add" caused
> you to add binary files to the repository.
> 
> plus, only "git add", the file will sit there in working tree, won't it?
> 
> you need the *full* series of commands, as the checklist.
> 
> l.
> 
> 
> 
> -- 
> ---
> crowd-funded eco-conscious hardware: https://www.crowdsupply.com/eoma68
> _______________________________________________
> Libre-soc-dev mailing list
> Libre-soc-dev at lists.libre-soc.org
> http://lists.libre-soc.org/mailman/listinfo/libre-soc-dev