On 05/06/2011 11:02 AM, Gary V. Vaughan wrote:
> On Fri, May 06, 2011 at 09:07:22AM -0700, Bruce Korb wrote:
>> I have forgotten why GIT tends to hang up without telling you why:
>>
>>> $ git push
>>> fatal: The remote end hung up unexpectedly
>>
>> so I haven't pushed the 180 commit merge.
>
On Fri, May 06, 2011 at 09:07:22AM -0700, Bruce Korb wrote:
> I have forgotten why GIT tends to hang up without telling you why:
>
> >$ git push
> >fatal: The remote end hung up unexpectedly
>
> so I haven't pushed the 180 commit merge.
If memory serves that happens when you make a read-only
On 05/05/11 07:20, Eric Blake wrote:
Rebasing a public branch is only acceptable if you make it equally
public that you are doing the rebase. Otherwise, you are better off
doing a merge rather than a rebase.
OK, I did it as a merge. There was a strange conflict in modules/inttypes
wherein Mak
Eric Blake wrote:
> The question then comes on how to incorporate the branch back into
> master.
For libposix, the approach I favour is that individual patches that address
individual issues (Gary and I have listed 9 issues) get proposed for master,
get reviewed, and then get committed. Individual
On 05/04/2011 11:11 PM, Gary V. Vaughan wrote:
> Howdy Bruce,
>
> On 5 May 2011, at 03:22, Bruce Korb wrote:
>> Not being a GIT guru, I had previously done "git merge" to
>> synchronize topic/libposix with master. Seemed straight
>> forward and obvious to me. However, "rebase" is a better
>> sp
Howdy Bruce,
On 5 May 2011, at 03:22, Bruce Korb wrote:
> Not being a GIT guru, I had previously done "git merge" to
> synchronize topic/libposix with master. Seemed straight
> forward and obvious to me. However, "rebase" is a better
> spelling for the proper process of resynchronization.
I'm
Not being a GIT guru, I had previously done "git merge" to
synchronize topic/libposix with master. Seemed straight
forward and obvious to me. However, "rebase" is a better
spelling for the proper process of resynchronization. So,
I did a "git rebase" and it was a mess. Lots of stuff would
not
