Mergeable branch is available here:
https://gitorious.org/solid-partitioner/solid-partitioner under the name
partitioner-merge. This branch has been created from a master branch I
updated right before, and then "partitioner" has been merged on it. During
the merge I had conflicts only on files I ne
On Tuesday, December 11, 2012 20:42:33 Lisa Vitolo wrote:
> What do you mean by mergeable with 4.10?
A patch or branch that cleanly applies against 4.10 (so the master branch in
most repositories right now).
--
sebas
http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9
_
The good news is that most of the work is on new files, so no need to
"compare" much.
What do you mean by mergeable with 4.10? I executed a "git pull
--rebase" not much time ago, so unless you committed something in this
last week, my branch is well updated (if you mean this ^^).
Lisa
2012/12/10
Ups, just saw the other thread and you already pointed the huge patch it will
be :p
So do that, push a branch in kdelibs mergeable with 4.10.
Cheers !
___
Kde-hardware-devel mailing list
Kde-hardware-devel@kde.org
https://mail.kde.org/mailman/listinfo/
On Wednesday 05 December 2012 01:09:31 Lisa Vitolo wrote:
> Hello again,
>
> I tried to post my patch on the reviewboard following the instructions
> on techbase. I generated the patch file locally, but when I upload it
> on the KDE reviewboard I get this error:
> error: unable to find e3ab51f82
Hello again,
I tried to post my patch on the reviewboard following the instructions
on techbase. I generated the patch file locally, but when I upload it
on the KDE reviewboard I get this error:
error: unable to find e3ab51f82bbd205f5be197bfd40aebddee5b07de
fatal: git cat-file e3ab51f82bbd205f5b
