El 26/8/20 a las 16:53, Digital Man escribió:
>   Re: Re: GitHub
>   By: alterego to Nelgin on Thu Aug 27 2020 05:13 am
> 
>  >   Re: Re: GitHub
>  >   By: Nelgin to Tony Langdon on Wed Aug 26 2020 11:45 am
>  >
>  >  Ne> But you still end up overwriting anything you changed whether you get
>  >  Ne> the latest zip or whether you pull the latest direct from git.
>  >
>  > Actually, for git - git pull doesnt overwrite local changes.
>  >
>  > If git finds that a pull will change files that have been modified
locally,
>  > it will refuse to checkout the pull. In which case, you may need to "git
>  > stash" your changes for the pull to complete, and then "git stash pop" to
>  > re-apply your changes and manually resolve any conflicts.
>  >
>  > I actually do this a lot, since I develop on my laptop and fix on the
>  > server, and changes on my laptop are often not yet committed to git...
> 
> Unfortunately, I think some people are confused because I've combined both
source code and run-time (e.g. text/config files) into the same repo. When I
first imported the CVS history into Git, I made multiple repositories
(approximating the "modules" I had in the CVS repo) but then later had a change
of mind and decided a Git "monorepo" was the better approach for this project.
> 
> I'm also of the opinion that nobody should ever try to "sync" their run-time
files (e.g. the contents of the ctrl and text directories) with the source
repository - unless they are very aware of what files to synchronize and what
not to. This is as true for Git as it was true of CVS. With CVS, you could
selectively update "modules" or "directories" and thus avoid (if you were
careful) the synchronization of those run-time files with the source repo. With
Git, the solution is to simply store the repo is a separate directory (e.g.
sbbs/repo). You can still use tools like 'diff' to compare your changes (in the
case of text files), but Git should now solve the problem of merge conflict
markers appearing mysteriously in sysops' configuration or text files. It'll be
harder for *nix to accidentally screw up their configurations. Most of this
doesn't matter at all to Windows sysops.
> 
>                                             digital man
> 
I agree. I had a separate directory with the source. The only dir that i
directly update from cvs was the "exec" and ocassionaly the xtrn , so is
not necesary the have "one dir for all"

---
 ￭ Synchronet ￭ Dock Sud BBS TLD 24 HS - bbs.docksud.com.ar