, however, leave me in detached head state after success.
>
> - Original Message - From: "Michael" <keybou...@gmail.com>
> To: <git-users@googlegroups.com>
> Sent: Thursday, August 10, 2017 3:55 PM
> Subject: Re: [git-users] Adding a pull request (n
ust 10, 2017 3:55 PM
Subject: Re: [git-users] Adding a pull request (newer master) to my build
On 2017-08-09, at 12:28 PM, Philip Oakley <philipoak...@iee.org> wrote:
Hi Michael,
[don't abuse the fact that 'head' on windows will find the HEAD pseudoref
file, as there are a few cases
e .git directory, so you you
> can see if they have what you expect.
>
> Philip
>
> - Original Message - From: "Michael" <keybou...@gmail.com>
> To: <git-users@googlegroups.com>
> Sent: Wednesday, August 09, 2017 12:53 AM
> Subject: Re: [git-
.
Philip
- Original Message -
From: "Michael" <keybou...@gmail.com>
To: <git-users@googlegroups.com>
Sent: Wednesday, August 09, 2017 12:53 AM
Subject: Re: [git-users] Adding a pull request (newer master) to my build
Thank you! And yes, everything in this case ha
erge
>> of the --no-ff rebased history.
>>
>> In the latter case the --first parent log should read ~~:
>> abc123 merge: rebased pr/897 series
>> def456 merge: original pr/987 series, pinned as second parent, using --OURS.
>> 78code former tip commit: whateve
erge
>> of the --no-ff rebased history.
>>
>> In the latter case the --first parent log should read ~~:
>> abc123 merge: rebased pr/897 series
>> def456 merge: original pr/987 series, pinned as second parent, using --OURS.
>> 78code former tip commit: whateve
d be my thoughts about retaining the old as well as the new.
Hope it works for you..
Philip
- Original Message - From: "Michael" <keybou...@gmail.com>
To: <git-users@googlegroups.com>
Sent: Tuesday, August 08, 2017 3:39 AM
Subject: [git-users] Adding a pull request
That would be my thoughts about retaining the old as well as the new.
>
> Hope it works for you..
>
> Philip
>
> - Original Message - From: "Michael" <keybou...@gmail.com>
> To: <git-users@googlegroups.com>
> Sent: Tuesday, August 08, 2017 3:39 AM
> Sub
t 08, 2017 3:39 AM
Subject: [git-users] Adding a pull request (newer master) to my build
I'm looking for how to add a pull request, based off a newer master, to my
master.
The specifics: I'm trying to work with OBS 18.0.2 (version 19 won't run on
my older OS). I'm trying to add in a pull r
I'm looking for how to add a pull request, based off a newer master, to my
master.
The specifics: I'm trying to work with OBS 18.0.2 (version 19 won't run on my
older OS). I'm trying to add in a pull request (979,
https://github.com/jp9000/obs-studio/pull/979 ) to my build.
That pull request
10 matches
Mail list logo
