On Thu, Feb 9, 2017 at 11:58 AM, Stephen Morton <stephen.c.mor...@gmail.com>
wrote:
> Thu, Feb 9, 2017 at 11:53 AM, Stephen Morton <stephen.c.mor...@gmail.com>
> wrote:
>
>>
>>
>> On Thu, Feb 9, 2017 at 10:48 AM, Igor Djordjevic <
>> igor.d
On Thursday, 9 February 2017 17:31:38 UTC-5, Philip Oakley wrote:
>
> Hi Stephen,
>
> There is another approach to merging, that is the 'imerge' tool [1], which
> does consider every commit on both sides of the merge.
>
> It was developed for the cases where the two branches have diverged in
Thu, Feb 9, 2017 at 11:53 AM, Stephen Morton <stephen.c.mor...@gmail.com>
wrote:
>
>
> On Thu, Feb 9, 2017 at 10:48 AM, Igor Djordjevic <
> igor.d.djordje...@gmail.com> wrote:
>
>> On Thursday, February 9, 2017 at 3:47:09 PM UTC+1, Stephen Morton wrote:
>&
On Thu, Feb 9, 2017 at 10:48 AM, Igor Djordjevic <
igor.d.djordje...@gmail.com> wrote:
> On Thursday, February 9, 2017 at 3:47:09 PM UTC+1, Stephen Morton wrote:
>>
>> On Thu, Feb 9, 2017 at 9:16 AM, Igor Djordjevic <igor.d.d...@gmail.com>
>> wrote:
>>
&
On Tuesday, 7 February 2017 18:25:32 UTC-5, Igor Djordjevic wrote:
>
> On Wednesday, January 25, 2017 at 11:17:11 PM UTC+1, Stephen Morton wrote:
>>
>> I'm looking for a git branching and merge strategy for merge with lots of
>> conflicts requiring multiple people. I
ow long does the project take?
>- How many changes (commits) do developers make per week?
>- How often do you merge ongoing changes from master into the project
>branch?
>- How many changes do developers make to master per week?
>
>
>
>
>
> On Monday,
jects or bug fixes etc? do multiple developers work on a branch or just
> single developers?
>
>
>
> On Wednesday, January 25, 2017 at 3:17:11 PM UTC-7, Stephen Morton wrote:
>
> I'm looking for a git branching and merge strategy for merge with lots of
> conflicts requiring multiple people. I ca
On Thursday, 26 January 2017 16:37:16 UTC-5, Magnus Therning wrote:
>
>
> Stephen Morton <stephen@gmail.com > writes:
>
> > I'm looking for a git branching and merge strategy for merge with lots
> > of conflicts requiring multiple people. I can make it w
On Thursday, 26 January 2017 16:12:43 UTC-5, Philip Oakley wrote:
>
> - Original Message -
>
> I'm looking for a git branching and merge strategy for merge with lots of
> conflicts requiring multiple people. I can make it work, and I understand
> git, but it all seems kind of awkward
I'm looking for a git branching and merge strategy for merge with lots of
conflicts requiring multiple people. I can make it work, and I understand
git, but it all seems kind of awkward and it feels like there must be a
better way.
I've got a big git merge to do. There are lots of conflicts
On Thursday, 5 March 2015 11:08:33 UTC-5, Thomas Ferris Nicolaisen wrote:
On Wednesday, March 4, 2015 at 9:11:45 PM UTC+1, Stephen Morton wrote:
I'm experiencing very slow git pushes. On the order of 1 minute to push a
trivial one-line change. When I set GIT_TRACE=1, I see that it seems
I'm experiencing very slow git pushes. On the order of 1 minute to push a
trivial one-line change. When I set GIT_TRACE=1, I see that it seems to be
taking a lot of time in the pack-objects phase.
Others are not seeing this with the same repo, but I'm the only one working
in a VM.
On Wednesday, 7 January 2015 20:22:46 UTC-5, Stephen Morton wrote:
On Wednesday, 7 January 2015 17:20:08 UTC-5, Magnus Therning wrote:
On Wed, Jan 07, 2015 at 12:40:35PM -0800, Stephen Morton wrote:
My team is planning a transition to git. We're a big division in a
corporate environment
On Saturday, 6 December 2014 05:50:37 UTC-5, Philip Oakley wrote:
Original Message -
*From: Stephen Morton*
*To:* git-...@googlegroups.com javascript:
*Sent:* Friday, December 05, 2014 7:11 PM
*Subject:* [git-users] Behavior of 'git clone --depth d
--no-single-branch
I'm trying to make a slice of a very large repo, discarding old history.
I'm doing this which I figure should take me back enough time.
git clone --depth 9320 --no-single-branch ssh://URL
But then the resulting repo has the entire history. Neither the whole
history, nor the master branch
15 matches
Mail list logo
