On 1 February 2011 09:21, Sebastian Trüg <tr...@kde.org> wrote: > Hi list, > > I have been working on an improvement for Nepomuk via git-svn for a > while now and would now like to push it to kde-runtime. > However, I would prefer to keep the commit history and backport to 4.6. > Thus, I thought of pushing my feature branch into the kde-runtime > repository and then merge it into master and 4.6. Is this an acceptable > way to handle such a situation? Or should I merge locally only and then > push both master and 4.6?
If you're not going to be working on this with other people, there's no point making a remote branch. And you don't want to be merging, you want to be cherry-picking. John