* Louis Bouchard [141120 10:52]:
> The upstream project I am working on has a new upstream release that I want to
> include in my git-dpm managed git repository[1].
[order of quoted text changed]
> In both cases, I end up with conflicts in the upstream code that I must fix,
> which is not what I e
Hi,
Le 20/11/2014 10:51, Louis Bouchard a écrit :
> Hello,
>
> The upstream project I am working on has a new upstream release that I want to
> include in my git-dpm managed git repository[1].
>
> I have tried the following method :
>
> * $ git-dpm import-new-upstream --rebase sosreport_3.2.or
Hello,
The upstream project I am working on has a new upstream release that I want to
include in my git-dpm managed git repository[1].
I have tried the following method :
* $ git-dpm import-new-upstream --rebase sosreport_3.2.orig.tar.gz
* Rebase my upstream-ubuntu/utopic branch with the new u
