* Goswin von Brederlow <goswin-...@web.de> [120311 19:51]:
> git-dpm?
http://git-dpm.alioth.debian.org/
http://wiki.debian.org/PackagingWithGit/GitDpm
> > That would still make git think that your upstream branch is based on
> > your master branch and thus has the modification "remove debian/" in it
> > which git will want to merge with any debian changes in the upstream
> > branch once you merge the two.
>
> That was the merge. After that there is nothing more to merge. And the
> next merge will do the same git-import-orig + merge -s ours trick.
But how do you get a new upstream code into master? If you try to update
upstream and merge it in master, it will think you want to remove
debian/
Bernhard R. Link
--
To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/20120312110006.gd2...@client.brlink.eu
