From mboxrd@z Thu Jan 1 00:00:00 1970 From: chirin Subject: Git beginner - Need help understanding Date: Mon, 26 Dec 2011 19:12:17 -0800 (PST) Message-ID: <1324955537875-7129186.post@n2.nabble.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Dec 27 04:12:42 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RfNSy-0005ji-U5 for gcvg-git-2@lo.gmane.org; Tue, 27 Dec 2011 04:12:41 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753719Ab1L0DMU (ORCPT ); Mon, 26 Dec 2011 22:12:20 -0500 Received: from sam.nabble.com ([216.139.236.26]:33907 "EHLO sam.nabble.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114Ab1L0DMS (ORCPT ); Mon, 26 Dec 2011 22:12:18 -0500 Received: from jim.nabble.com ([192.168.236.80]) by sam.nabble.com with esmtp (Exim 4.72) (envelope-from ) id 1RfNSb-0007Uz-Tc for git@vger.kernel.org; Mon, 26 Dec 2011 19:12:17 -0800 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: I'm just beginning to use Git in my workplace, and (rather shamefully) have never heard of Git until now. While I pore over the stacks of documentations for beginners, could someone help me understand this issue I've been having? Every time a colleague updates a file, I would not be able to pull due to merge conflicts - even though I have never made any changes to the repository. I'd try and then again, but it would still give the same merge conflict. The only way I could pull currently is to do a git commit (even without changes), and then git pull. If this was SVN, I could simply resolve this with Update. What am I missing, and what should I be looking for? Thanks in advance.. -- View this message in context: http://git.661346.n2.nabble.com/Git-beginner-Need-help-understanding-tp7129186p7129186.html Sent from the git mailing list archive at Nabble.com.