[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: rebasing topic/libposix
From: |
Bruce Korb |
Subject: |
Re: rebasing topic/libposix |
Date: |
Fri, 06 May 2011 09:07:22 -0700 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.14) Gecko/20110221 SUSE/3.1.8 Thunderbird/3.1.8 |
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 Makefile.am stuff added to libposix branch conflicted with empty
text in master. My resolution was to leave it in. I've pushed this,
so topic/libposix should now be current with master. It builds, checks and
installs on x86-64 Linux.
Since I find it easier to manage temporary release files on sourceforge:
http://autogen.sourceforge.net/data/libposix-0.0.5276-10c1e.tar.gz
and 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.....