Hi,
I did it now this way. Should work now. Could you please have another
look? Thanks (:
Cheers!
Muri Nicanor: > my approach would be: delete the remote branch using: git push
> https://gitlab.com/spriver/tails :de_persistence
>
> mv the local tails folder out of the way reacreate it using git
> pull https://git-tails.immerda.ch/tails cd tails git checkout -b
> de_persistence copy the files from the old tails folder commit push
> ;)
>
> cheers, muri
>
> On 12/11/2015 03:42 AM, spriver wrote:
>> Indeed. But it also says the same for my master branch, it stays
>> this way even after pulling from tails master. Can someone help
>> me and say what I'm doing wrong here?
>>
>> Muri Nicanor:
>>> nope.
>>> https://gitlab.com/spriver/tails/blob/de_persistence/config/base_bra nch >>>
>>> says feature/jessie >>> if rebasing doesn't work for you (i know it doesn't work most
>>> of the time i try to do it) just safe the changed files
>>> somewhere, create a new branch based on master, and copy the
>>> files into the branch..
>>>
>>> cheers, muri
>>>
>>> On 12/10/2015 06:06 PM, spriver wrote:
>>>> Hi, I rebased upon master, could you have a look at it?
>>>>
>>>> Cheers! spriver
>>>>
>>>> Muri Nicanor:
>>>>> yes, please rebase on master ;)
>>>>
>>>>> On 12/06/2015 03:34 PM, spriver wrote:
>>>>>> Hi, to fix this I should rebase on master? Or how should
>>>>>> I proceed here?
>>>>>>
>>>>>> Cheers!
>>>>>>
>>>>>> sajolida:
>>>>>>> Muri Nicanor:
>>>>>>>> thats what i get when mergin you branch:
>>>>>>>> https://share.riseup.net/#dCKce91OfBDeAX2yd26kAA by
>>>>>>>> now i'm not sure anymore if its maybe my master
>>>>>>>> branch which is broken...? maybe someone could take a
>>>>>>>> look who has more git knowledge?
>>>>>>
>>>>>>> Maybe your branch was based on feature/jessie?
>>>>>>
>>>>>>> For example:
>>>>>>
>>>>>>> $ git diff origin/master...spriver/de_persistence
>>>>>>> config/base_branch diff --git a/config/base_branch
>>>>>>> b/config/base_branch index 2bf5ad0..0d639f2 100644 ---
>>>>>>> a/config/base_branch +++ b/config/base_branch @@ -1 +1
>>>>>>> @@ -stable +feature/jessie
