Forum .LRN Q&A: Re: Merge oacs-5-1 & oacs-5-2 (dotlrn-all packages)
in merging the bugs fixed from oacs-5-1
to the oacs-5-2 branch for
all the packages included in dotlrn-all.
The merge has been finished.
There is a Tag named: vg-merge-dotlrn-2-2-pre-20050922
which is a "snapshot" of the repository before the merge.
And there is one Tag named: vg-merge-dotlrn-2-2-post-20050926, which is a "snapshot" of the repository after the merge.
And finally there is one tag named: vg-merge-dotlrn-2-1-20050922 which was used as reference
to the oacs-5-1 branch.
This is the list of packages that i merged:
Plese, if you are commiting a bug fix or something *DO NOT*: change the indentations of the code, add/remove spaces/tabs/lines. If you are changing indentation or something, do it with a different commit with a well explained message indicating what are you doing.
This would make easier the process of merge. :).