Beginner question on Pull is mostly evil

2014-05-07 Thread Jim Garrison
During my initial self-education I came across the maxim don't pull, fetch+merge instead and have been doing that. I think I followed most of the pull is (mostly) evil discussion but one facet still puzzles me: the idea that pull will do a merge in the wrong direction sometimes. Do I

Re: Beginner question on Pull is mostly evil

2014-05-07 Thread David Kastrup
Jim Garrison jim.garri...@nwea.org writes: During my initial self-education I came across the maxim don't pull, fetch+merge instead and have been doing that. I think I followed most of the pull is (mostly) evil discussion but one facet still puzzles me: the idea that pull will do a merge in

Re: Beginner question on Pull is mostly evil

2014-05-07 Thread Jeff King
On Wed, May 07, 2014 at 03:40:28PM +, Jim Garrison wrote: During my initial self-education I came across the maxim don't pull, fetch+merge instead and have been doing that. I think I followed most of the pull is (mostly) evil discussion but one facet still puzzles me: the idea that pull

Re: Beginner question on Pull is mostly evil

2014-05-07 Thread Junio C Hamano
Jim Garrison jim.garri...@nwea.org writes: During my initial self-education I came across the maxim don't pull, fetch+merge instead and have been doing that. I think I followed most of the pull is (mostly) evil discussion but one facet still puzzles me: the idea that pull will do a merge in

RE: Beginner question on Pull is mostly evil

2014-05-07 Thread Jim Garrison
-Original Message- From: Junio C Hamano Sent: Wednesday, May 07, 2014 1:16 PM Subject: Re: Beginner question on Pull is mostly evil No. This is most often true for people who use a single repository as a place for everybody to meet, in the same way as SVN. [snip lots of excellent

Re: Beginner question on Pull is mostly evil

2014-05-07 Thread Junio C Hamano
Jim Garrison jim.garri...@nwea.org writes: -Original Message- From: Junio C Hamano Sent: Wednesday, May 07, 2014 1:16 PM Subject: Re: Beginner question on Pull is mostly evil No. This is most often true for people who use a single repository as a place for everybody to meet

Re: Beginner question on Pull is mostly evil

2014-05-07 Thread Stephen Linda Smith
I'll create a patch. On Wednesday, May 07, 2014 01:51:04 PM Junio C Hamano wrote: Jim Garrison jim.garri...@nwea.org writes: -Original Message- From: Junio C Hamano Sent: Wednesday, May 07, 2014 1:16 PM Subject: Re: Beginner question on Pull is mostly evil