home | list info | list archive | date index | thread index

Re: git pull vs svn up

On Sat, 13 Jul 2019, J C Nash wrote:

> For my own work I mostly use svn since I have it well-established on
> my uottawa VPS. However, I'm using gitlab for a project I share with
> others.
>
> Am I correct that
>
>   git pull
>
> will NOT restore files that have somehow been deleted or renamed?

  "git pull" will do two things:

1) fetch new content from the upstream, then
2) *attempt* to merge that new content into your master branch
   (assuming it's your master branch you're working with)

  are you asking about files you've renamed or deleted locally, and
committed locally as well?

rday

-- 

========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                         http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================

To unsubscribe send a blank message to linux+unsubscribe [ at ] linux-ottawa [ dot ] org
To get help send a blank message to linux+help [ at ] linux-ottawa [ dot ] org
To visit the archives: https://lists.linux-ottawa.org

replies

references

message navigation