|
|
| Author |
Message |
|
| Guest |
 Posted: Mon Mar 29, 2010 6:12 am |
 |
|
|
Guest
|
On Mon, Mar 29, 2010 at 12:33 AM, Rory Byrne <rory@jinsky.com> wrote:
> git fetch git://github.com/jinsky/otp.git ssl_transport_accept_fix
>
Thanks!
I'll wait a few days with including this change because there is
currently a build problem in the ssl application, and because I've
had to revert a commit there is now a merge conflict with the
revert commit. Since the revert commit in the 'pu' branch is
a temporary thing, I will wait until it is gone before I'll resolve
any merge conflicts.
Another thing: Your branch contains multiple merges from the dev
branch. I cannot merge such a branch to 'pu', but I can handle
by cherry-picking the actual without much problems. Still, in the
future you might want to use "git rebase" instead of "git merge"
when you want to update your branch with the latest changes
from the dev branch (in case you haven't used "git merge",
note that "git pull" is the same as "git fetch" followed by
"git merge").
--
Björn Gustavsson, Erlang/OTP, Ericsson AB
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Mon Mar 29, 2010 6:12 am |
|
|
|
Guest
|
On Mon, Mar 29, 2010 at 12:33 AM, Rory Byrne <rory@jinsky.com> wrote:
> git fetch git://github.com/jinsky/otp.git ssl_transport_accept_fix
>
Thanks!
I'll wait a few days with including this change because there is
currently a build problem in the ssl application, and because I've
had to revert a commit there is now a merge conflict with the
revert commit. Since the revert commit in the 'pu' branch is
a temporary thing, I will wait until it is gone before I'll resolve
any merge conflicts.
Another thing: Your branch contains multiple merges from the dev
branch. I cannot merge such a branch to 'pu', but I can handle
by cherry-picking the actual without much problems. Still, in the
future you might want to use "git rebase" instead of "git merge"
when you want to update your branch with the latest changes
from the dev branch (in case you haven't used "git merge",
note that "git pull" is the same as "git fetch" followed by
"git merge").
--
Björn Gustavsson, Erlang/OTP, Ericsson AB
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Thu Apr 01, 2010 5:35 am |
|
|
|
Guest
|
On Thu, Apr 1, 2010 at 12:02 AM, Rory Byrne <rory@jinsky.com> wrote:
> I've rebased this branch against the updated (fixed) dev branch:
>
> git fetch git://github.com/jinsky/otp.git ssl_transport_accept_fix
>
Thanks! Will include in 'pu'.
--
Björn Gustavsson, Erlang/OTP, Ericsson AB
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
| Guest |
| Posted: Thu Apr 01, 2010 5:36 am |
|
|
|
Guest
|
On Thu, Apr 1, 2010 at 12:02 AM, Rory Byrne <rory@jinsky.com> wrote:
> I've rebased this branch against the updated (fixed) dev branch:
>
> git fetch git://github.com/jinsky/otp.git ssl_transport_accept_fix
>
Thanks! Will include in 'pu'.
--
Björn Gustavsson, Erlang/OTP, Ericsson AB
________________________________________________________________
erlang-patches (at) erlang.org mailing list.
See http://www.erlang.org/faq.html
To unsubscribe; mailto:erlang-patches-unsubscribe@erlang.org
Post received from mailinglist |
|
|
| Back to top |
|
|
|
All times are GMT
|
|
You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You cannot attach files in this forum
You cannot download files in this forum
|
|
|
Digg It
Del.icio.us
Reddit
Facebook
Stumble Upon
Technorati
