git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jim Garrison <jim.garrison@nwea.org>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Beginner question on "Pull is mostly evil"
Date: Wed, 7 May 2014 15:40:28 +0000	[thread overview]
Message-ID: <0C723FEB5B4E5642B25B451BA57E2730751C2642@S1P5DAG3C.EXCHPROD.USA.NET> (raw)

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 understand correctly that this occurs only in the presence of multiple remotes?  
Can someone provide a simple example of a situation where pull would do the "wrong" thing?

Thanks

             reply	other threads:[~2014-05-07 15:50 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-07 15:40 Jim Garrison [this message]
2014-05-07 16:20 ` Beginner question on "Pull is mostly evil" David Kastrup
2014-05-07 17:04 ` Jeff King
2014-05-07 20:15 ` Junio C Hamano
2014-05-07 20:30   ` Jim Garrison
2014-05-07 20:51     ` Junio C Hamano
2014-05-08  0:45     ` Stephen & Linda Smith
2014-05-09  6:08   ` [PATCH] How to keep a project's canonical history correct Stephen P. Smith
2014-05-09 13:41     ` Stephen Smith
2014-05-09 21:05     ` Junio C Hamano
2014-05-10  4:01     ` Stephen & Linda Smith

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0C723FEB5B4E5642B25B451BA57E2730751C2642@S1P5DAG3C.EXCHPROD.USA.NET \
    --to=jim.garrison@nwea.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).