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
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
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 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:
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
