[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-i18n-doc
Subject:    Does scripty support multiple branches in git?
From:       Andreas Pakulat <apaku () gmx ! de>
Date:       2010-12-22 8:01:02
Message-ID: 20101222080101.GB13259 () trinity ! apaku ! dnsalias ! org
[Download RAW message or body]

Hi,

it seems that scripty currently doesn't support multiple git branches
very well. In particular if the stable branch is merged automatically
into the master branch. This is whats done in KDevelop currently and we
regularly end up with conflicts in translations of .desktop files, which
is really annoying.

Is there a way to fix this somehow? Should I talk to someone else? Any
pointers are appreciated.

Andreas

-- 
That secret you've been guarding, isn't.
[prev in list] [next in list] [prev in thread] [next in thread]