[Libre-soc-dev] git guide

[Umberto Cerrato]

> Il giorno 29 mar 2021, alle ore 11:56, Luke Kenneth Casson Leighton <lkcl at lkcl.net> ha scritto:
> 
> ok, so the picture i had in my mind for the git guide is:
> 
> # what to do if you want to modify some pages

“Pages”? Shouldn’t this be useful for the entire workflow?

> 
> here is the checklist for making changes.  if you do not intend to complete
> the work right the way through to "git push" immediately (at least by end
> of day), or do not "have time", reconsider and find a way to make the work
> smaller.  if unsure, ask on the mailing list.
> 
> * run "git pull"
> * edit files, making sure only one “purpose"

I think I understand what you mean here, but I would like a bit deeper explanation. 

> * save them
> * run unit tests and make sure they pass
> * fix errors
> * run "git status | more", review the output

I think that is the vertical bar character, right?

> * run "git diff", review the output
> * run "git commit -a -m 'useful description' "
> * run "git pull"
> * run "git push"
> 
> now an explanation of those.
> 
> # what to do if "git pull" results in conflict
> 

I do not know sincerely.

> ...
> ....
> 
> # what to do if you want to add files.
> 
> …

Neither this… “git add “ ?

> 
> this one, "git status" is very important, to check files that should have
> been added but have not
> 
> 
> etc etc etc.
> 
> 

I will start embedding this in the page.

> 
> -- 
> ---
> 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