Account Options

  1. Sign in
The old Google Groups will be going away soon, but your browser is incompatible with the new version.
Google Groups Home
« Groups Home
Piston
Home
+ new post
About this group
Join this group
piston update leaves merge conflicts in my tree
Options
There are currently too many topics in this group that display first. To make this topic appear first, remove this option from another topic.
There was an error processing your request. Please try again.
flag
   3 messages - Collapse all  -  Translate all to Translated (View all originals)
The group you are posting to is a Usenet group. Messages posted to this group will make your email address visible to anyone on the Internet.
Your reply message has not been sent.
Your post was successful
 
From:
To:
Cc:
Followup To:
Add Cc | Add Followup-to | Edit Subject
Subject:
Validation:
For verification purposes please type the characters you see in the picture below or the numbers you hear by clicking the accessibility icon. Listen and type the numbers you hear
 
Scott Johnson  
View profile  
 More options Dec 4 2009, 2:06 pm
From: Scott Johnson <sc...@scottjohnson.org>
Date: Fri, 4 Dec 2009 11:06:48 -0800 (PST)
Local: Fri, Dec 4 2009 2:06 pm
Subject: piston update leaves merge conflicts in my tree
Print | Individual message | Show original | Report this message | Find messages by this author
I'm using Piston with Git. When I have local modifications to one of
my vendored projects, and I run a piston update, it leaves files in
the index with merge conflict markers. Since these files are already
in the Git index, git doesn't warn me that they are unmerged.

I would have expected it to warn me and leave them unmerged (like a
'git merge' with merge conflicts would)...


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Scott Johnson  
View profile  
 More options Dec 8 2009, 7:47 pm
From: Scott Johnson <sc...@scottjohnson.org>
Date: Tue, 8 Dec 2009 16:47:30 -0800 (PST)
Local: Tues, Dec 8 2009 7:47 pm
Subject: Re: piston update leaves merge conflicts in my tree
Print | Individual message | Show original | Report this message | Find messages by this author
I asked on StackOverflow how I might be able to fix this problem. But
it sounds more complex than I'm prepared to deal with.

http://stackoverflow.com/questions/1869530/how-do-i-force-git-to-thin...

On Dec 4, 11:06 am, Scott Johnson <sc...@scottjohnson.org> wrote:


 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
Sergio Cambra .:: entreCables S.L. ::.  
View profile  
 More options Dec 9 2009, 4:26 am
From: "Sergio Cambra .:: entreCables S.L. ::." <ser...@entrecables.com>
Date: Wed, 9 Dec 2009 10:26:06 +0100
Local: Wed, Dec 9 2009 4:26 am
Subject: Re: piston update leaves merge conflicts in my tree
Print | Individual message | Show original | Report this message | Find messages by this author
On Miércoles, 9 de Diciembre de 2009 01:47:30 Scott Johnson escribió:

> I asked on StackOverflow how I might be able to fix this problem. But
> it sounds more complex than I'm prepared to deal with.

> http://stackoverflow.com/questions/1869530/how-do-i-force-git-to-thin...
>le-is-unmerged

I wrote the merge code but I couldn't guess how to force git. Maybe piston
warns you when it happens, I can't remember it

> On Dec 4, 11:06 am, Scott Johnson <sc...@scottjohnson.org> wrote:
> > I'm using Piston with Git. When I have local modifications to one of
> > my vendored projects, and I run a piston update, it leaves files in
> > the index with merge conflict markers. Since these files are already
> > in the Git index, git doesn't warn me that they are unmerged.

> > I would have expected it to warn me and leave them unmerged (like a
> > 'git merge' with merge conflicts would)...

--
Sergio Cambra .:: entreCables S.L. ::.
Mariana Pineda 23, 50.018 Zaragoza
T) 902 021 404 F) 976 52 98 07 E) ser...@entrecables.com

 
You must Sign in before you can post messages.
To post a message you must first join this group.
Please update your nickname on the subscription settings page before posting.
You do not have the permission required to post.
End of messages
« Back to Discussions « Newer topic     Older topic »

Create a group - Google Groups - Google Home - Terms of Service - Privacy Policy
©2013 Google