www.libssh2.org | Daily snapshots | Mailing list archive | Docs | Examples | github

Archive Index This month's Index

Subject: Re: release-time !?

Re: release-time !?

From: Kamil Dudka <kdudka_at_redhat.com>
Date: Tue, 10 Sep 2013 12:02:32 +0200

On Tuesday 10 September 2013 06:47:43 Peter Stuge wrote:
> It really feels like you have wasted my efforts, and the worst part
> is that you can't really do much to fix it now.

As long as you find it easier to rebase Mark's patch on top of yours, you can:

1. revert the just pushed patch
2. apply your patches
3. cherry-pick the patch you reverted
4. resolve the conflicts and commit the resulting patch again

Still it is more common to rebase patches that are not yet upstream...

Kamil
_______________________________________________
libssh2-devel http://cool.haxx.se/cgi-bin/mailman/listinfo/libssh2-devel
Received on 2013-09-10

the libssh2 team