On Wed, 13 Mar 2013 15:18:58 -0400
wor...@alum.mit.edu (Dale R. Worley) wrote:
[...]
> Modern version control systems incorporate techniques to allow people
> to work effectively without needing locking. I suggest you revisit
> your perceived need for locking to check whether you really need it.
Sorry to cross post, but I'm having this issue:
(original question at
http://stackoverflow.com/questions/15387812/git-svn-found-possible-branch-point)
I run the following command:
C:\Projects>git svn clone -T trunk -b branches -t tags --no-metadata
https://svn.mycompany.com/Projects/MyProject My
On Thu, 14 Mar 2013 04:40:39 -0700 (PDT)
Ilya Dobrovolsky wrote:
> The start page of http://git-scm.com/ containts link to the latest
> stable release.
> It says, latest stable release 1.8.1.3 Release Notes (2013-02-07).
> When I follow the link, the following file is downloaded:
> Git-1.8.1.2-p
Background: We have a series of components and applications that use those
components with each having it's own repository. We also use travis ci
for testing when we make a push to the repos. The issue we have is that
when one of the components is modified it may effect one of the
applicatio
On Thu, 14 Mar 2013 04:58:23 -0700 (PDT)
Alex Brown wrote:
> Sorry to cross post, but I'm having this issue:
> (original question at
> http://stackoverflow.com/questions/15387812/git-svn-found-possible-branch-point)
>
> I run the following command:
>
> C:\Projects>git svn clone -T trunk -b bra
On Thu, 14 Mar 2013 05:52:06 -0700 (PDT)
Rob Dingwell wrote:
[...]
> The way I went about trying to do this was to set up a mac mini that
> we have with each of the repos in question checked out along with a
> launchagent (similar to cron for osx) that would periodically do a
> pull on each of t
It's:
1.8.1.msysgit.1
On 14 March 2013 14:32, Konstantin Khomoutov wrote:
> On Thu, 14 Mar 2013 04:58:23 -0700 (PDT)
> Alex Brown wrote:
>
> > Sorry to cross post, but I'm having this issue:
> > (original question at
> >
> http://stackoverflow.com/questions/15387812/git-svn-found-possible-bra
How do I reset one working file, but leave the index alone? git checkout
file does not do that
(it appears to do nothing), nor does git checkout -- file.
To clarify, I've edited a file, then added it to the index. I now want to
leave the change in the index,
but reset the working file to the ch
On Thu, Mar 14, 2013 at 11:24:27AM -0700, joeriel...@gmail.com wrote:
> How do I reset one working file, but leave the index alone? git checkout
> file does not do that
> (it appears to do nothing), nor does git checkout -- file.
>
> To clarify, I've edited a file, then added it to the index. I
On Thu, Mar 14, 2013 at 3:54 PM, Konstantin Khomoutov <
flatw...@users.sourceforge.net> wrote:
> On Thu, Mar 14, 2013 at 11:24:27AM -0700, joeriel...@gmail.com wrote:
>
> > How do I reset one working file, but leave the index alone? git checkout
> > file does not do that
> > (it appears to do not
On Thursday, March 14, 2013 11:54:36 AM UTC-7, Konstantin Khomoutov wrote:
>
> On Thu, Mar 14, 2013 at 11:24:27AM -0700, joeri...@gmail.com
> wrote:
>
> > How do I reset one working file, but leave the index alone? git
> checkout
> > file does not do that
> > (it appears to do nothing), nor
On Thursday, March 14, 2013 6:28:36 PM UTC-7, joeri...@gmail.com wrote:
>
>
>
> On Thursday, March 14, 2013 11:54:36 AM UTC-7, Konstantin Khomoutov wrote:
>>
>> On Thu, Mar 14, 2013 at 11:24:27AM -0700, joeri...@gmail.com wrote:
>>
>> > How do I reset one working file, but leave the index alone?
Hi
I have started branch from master
then on master were changes in whitespace (code formatting)
in branch on that lines changes were not.
Now when I try to merge branch to master I get lost changes at space on
master
So I try to ignore space change
git merge -Xignore-space-change my_branch
I
13 matches
Mail list logo
