On Mon, 17 Oct 2016 23:01:00 tho...@fvwm.org wrote:
> On Mon, Oct 17, 2016 at 10:57:58PM +0100, Dominik Vogt wrote:
> > On Mon, 17 Oct 2016 22:55:56 wrote:
> >
> > Does anybody really use libstroke support? It's resonsible for
> > quite some hardly readably code, and I suspect nobody uses it
> >
On Sun, Oct 23, 2016 at 07:21:55AM +1000, Stuart Longland wrote:
> On Git flow projects, master branch is always the latest stable release.
I'm aware of git-flow, and it sucks. A solution to a problem which for most
project won't exist.
If you were to do:
% git checkout master && git pull
Then
On 23/10/16 06:58, Thomas Adam wrote:
>> Is there going to be some sort of naming and usage convention around
>> > branches, e.g. like Git flow¹? Or is 'master' where the action happens?
> Did you read DEVELOPERS.md? Don't misunderstand me, it's in that document,
> and if it's not clear, I again
On Sun, Oct 23, 2016 at 06:52:46AM +1000, Stuart Longland wrote:
> On 23/10/16 02:54, Thomas Adam wrote:
> > On Sat, Oct 22, 2016 at 05:11:46PM +0100, Dominik Vogt wrote:
> >> > Yes, but that's actually not the part I was asking about. How the
> >> > "git pull-request" should look like is not in t
On 23/10/16 02:54, Thomas Adam wrote:
> On Sat, Oct 22, 2016 at 05:11:46PM +0100, Dominik Vogt wrote:
>> > Yes, but that's actually not the part I was asking about. How the
>> > "git pull-request" should look like is not in the docs.
> OK. For that, you'd have to use their web interface. See:
>
On Fri, Oct 21, 2016 at 10:12:01AM +0200, Volker wrote:
> I updated (from cvs) to the latest version in git, but
> unfortunately lost png support under the transition.
This should be fixed now on master; please check.
-- Thomas Adam
On Sat, Oct 22, 2016 at 05:11:46PM +0100, Dominik Vogt wrote:
> Yes, but that's actually not the part I was asking about. How the
> "git pull-request" should look like is not in the docs.
OK. For that, you'd have to use their web interface. See:
https://help.github.com/articles/about-pull-requ
Hi,
Ensure master is up to date in your checkout, then on you topic branch:
git rebase master
If there were changes on master which weren't on your branch you'll have to
force push your topic branch out again to build in Travis. Then:
git checkout master
git merge topic-branch
git push
It's al
