Hi,
I tried around with my repo but I could not really figure out what to
do now...what I understand regarding to the rebase is that I shall
merge both commits of mine? Or am I getting something wrong here?
(git is a bit of some sort of magic for me ;) ) Can someone help me here
?
Cheers!
Muri Nicanor:
> hi,
>
> On 08/02/2015 08:08 PM, spriver wrote:
>> https://gitlab.com/spriver/tails.git branch: de_tor_browser
>> latest commit: f4199a8 Several edit's and corrections
> well, i think we've waited too long and now i get a conflict when
> trying to merge the branch into the current master... spriver, if
> its not too much to ask, could you rebase the branch on current
> master?
>
> cheers, muri
>
