Mailing List Archive: GIT

GIT

Aug 28, 2022, 9:10 PM

Post #1 of 4 (374 views)

Hi all
I’m using git pretty much exactly as mythtv does. ie

...
fixes/31
fixes/32

Where there will never be a merge of 31 and 32. All ticks along just fine until, one dsy,

hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.

How does mythtv deal with this issue? I can find nothing in the docs.
James

_______________________________________________
mythtv-dev mailing list
mythtv-dev@mythtv.org
http://lists.mythtv.org/mailman/listinfo/mythtv-dev
http://wiki.mythtv.org/Mailing_List_etiquette
MythTV Forums: https://forum.mythtv.org

Re: GIT [ In reply to ]

johnpilk222 at gmail

Aug 29, 2022, 1:22 AM

Post #2 of 4 (374 views)

Permalink

On 29/08/2022 05:10, James Linder wrote:
> Hi all
> I’m using git pretty much exactly as mythtv does. ie
>
> ...
> fixes/31
> fixes/32
>
> Where there will never be a merge of 31 and 32. All ticks along just fine until, one dsy,
>
> hint: You have divergent branches and need to specify how to reconcile them.
> hint: You can do so by running one of the following commands sometime before
> hint: your next pull:
> hint:
> hint: git config pull.rebase false # merge (the default strategy)
> hint: git config pull.rebase true # rebase
> hint: git config pull.ff only # fast-forward only
> hint:
> hint: You can replace "git config" with "git config --global" to set a default
> hint: preference for all repositories. You can also pass --rebase, --no-rebase,
> hint: or --ff-only on the command line to override the configured default per
> hint: invocation.
> fatal: Need to specify how to reconcile divergent branches.
>
> How does mythtv deal with this issue? I can find nothing in the docs.
> James
>
This post from Peter, on 6 July, works for me. It's buried in a longish
thread.

https://lists.archive.carbon60.com/mythtv/dev/641470#641470

John P
_______________________________________________
mythtv-dev mailing list
mythtv-dev@mythtv.org
http://lists.mythtv.org/mailman/listinfo/mythtv-dev
http://wiki.mythtv.org/Mailing_List_etiquette
MythTV Forums: https://forum.mythtv.org

Re: GIT [ In reply to ]

scott.the.elm at gmail

Aug 29, 2022, 12:34 PM

Post #3 of 4 (374 views)

Permalink

On 8/29/22 04:22, John Pilkington wrote:
> On 29/08/2022 05:10, James Linder wrote:
>> Hi all
>> I’m using git pretty much exactly as mythtv does. ie
>>
>> ...
>> fixes/31
>> fixes/32
>>
>> Where there will never be a merge of 31 and 32. All ticks along just
>> fine until, one dsy,
>>
>> hint: You have divergent branches and need to specify how to
>> reconcile them.
>> hint: You can do so by running one of the following commands sometime
>> before
>> hint: your next pull:
>> hint:
>> hint:   git config pull.rebase false # merge (the default strategy)
>> hint:   git config pull.rebase true   # rebase
>> hint:   git config pull.ff only       # fast-forward only
>> hint:
>> hint: You can replace "git config" with "git config --global" to set
>> a default
>> hint: preference for all repositories. You can also pass --rebase,
>> --no-rebase,
>> hint: or --ff-only on the command line to override the configured
>> default per
>> hint: invocation.
>> fatal: Need to specify how to reconcile divergent branches.
>>
>> How does mythtv deal with this issue? I can find nothing in the docs.
>> James
>>
> This post from Peter, on 6 July, works for me. It's buried in a
> longish thread.
>
> https://lists.archive.carbon60.com/mythtv/dev/641470#641470
>
> John P
>

If you have committed on top of fixes/31, or any other upstream branch*,
you will probably want to `git checkout -b new_branch_name` and then
checkout the original branch, so you can later cherry-pick your changes
back onto upstream in a new branch from new_branch_name.

*This is bad practice, use local feature branches instead, so you can
just simply pull upstream branch_name and then rebase your feature
branch onto it (or merge if that floats your boat).

Regards,

Scott

_______________________________________________
mythtv-dev mailing list
mythtv-dev@mythtv.org
http://lists.mythtv.org/mailman/listinfo/mythtv-dev
http://wiki.mythtv.org/Mailing_List_etiquette
MythTV Forums: https://forum.mythtv.org

Re: GIT [ In reply to ]

jam at tigger

Aug 31, 2022, 12:10 AM

Post #4 of 4 (365 views)

Permalink

>>> Hi all
>>> I?m using git pretty much exactly as mythtv does. ie
>>>
>>> ...
>>> fixes/31
>>> fixes/32
>>>
>>> Where there will never be a merge of 31 and 32. All ticks along just
>>> fine until, one dsy,
>>>
>>> hint: You have divergent branches and need to specify how to
>>> reconcile them.
>>> hint: You can do so by running one of the following commands sometime
>>> before
>>> hint: your next pull:
>>> hint:
>>> hint:?? git config pull.rebase false? # merge (the default strategy)
>>> hint:?? git config pull.rebase true?? # rebase
>>> hint:?? git config pull.ff only?????? # fast-forward only
>>> hint:
>>> hint: You can replace "git config" with "git config --global" to set
>>> a default
>>> hint: preference for all repositories. You can also pass --rebase,
>>> --no-rebase,
>>> hint: or --ff-only on the command line to override the configured
>>> default per
>>> hint: invocation.
>>> fatal: Need to specify how to reconcile divergent branches.
>>>
>>> How does mythtv deal with this issue? I can find nothing in the docs.
>>> James
>>>
>> This post from Peter, on 6 July, works for me.? It's buried in a
>> longish thread.
>>
>> https://lists.archive.carbon60.com/mythtv/dev/641470#641470
>>
>> John P
>>
>
> If you have committed on top of fixes/31, or any other upstream branch*,
> you will probably want to `git checkout -b new_branch_name` and then
> checkout the original branch, so you can later cherry-pick your changes
> back onto upstream in a new branch from new_branch_name.
>
> *This is bad practice, use local feature branches instead, so you can
> just simply pull upstream branch_name and then rebase your feature
> branch onto it (or merge if that floats your boat).

Hi Scott, thanks

my frustration is that everything I can find subtly or overtly refers to merging. I imagine fixes/31 and fixes/32 will never be merged but it is convenient to keep all in one place. As an utter heathen using git in strange ways using -f seems to the-unwashed-mass:me to be not clever. At least it quells the
>>> fatal: Need to specify how to reconcile divergent branches.
message. I hoped someone would be able to say "we do bla bla"
James

_______________________________________________
mythtv-dev mailing list
mythtv-dev@mythtv.org
http://lists.mythtv.org/mailman/listinfo/mythtv-dev
http://wiki.mythtv.org/Mailing_List_etiquette
MythTV Forums: https://forum.mythtv.org