[fpc-devel] Parallel processing in the compiler
florian at freepascal.org
Sun Sep 5 15:08:23 CEST 2010
Am 05.09.2010 14:17, schrieb Juha Manninen (gmail):
> On Sunday 05 September 2010 13:29:38 Graeme Geldenhuys wrote:
>> Reading Jonas's comments and your reply above, it seems a git mirror
>> (or a subversion/git dual setup) would be much better suited for your
>> working style. git allows local commits and local branches. Ideal for
>> cases like "so those changes don't get lost" or braking a large set of
>> changes into smaller commits.
> I can recommend it, too.
> In some earlier mail I mentioned it would solve DoDi's problems with merging
> his branch with trunk after they have deviated much from each other.
The problem is conflict solving and this is usually the equally hard
part with any scm.
> Having your local git branch active, just run :
> $ git rebase master
> (assuming master branch is trunk)
I don't see how this is different from merging new trunk changes to a
feature branch in svn? See e.g. r15421 where Jonas merged all new
changes from trunk into the cpstrnew branch.
More information about the fpc-devel