Graeme Geldenhuys schrieb:
On 13 March 2011 09:59, Hans-Peter Diettrich <DrDiettrich1@***> wrote:
Problems arise with branches.
For example?
When I work in a local branch, and find something worth to document, then
this documentation is added to the branch and removed when switching back to
another branch.
Don't you use git?
I do, and whenever I switch branches, the help files are switched as well.
If you do, the change are carried over (unless the
branch you are switch too, has different changes to the current
branch). If the latter, simply use 'git stash' and 'git stash pop' to
carry changes over - that if you didn't want to commit them for some
or other reason.
I don't stash changes, instead I either commit all changes or reset the
old branch. Just to make sure that I don't mix up modifications to
different branches.
BTW, in my FPC development I created independent local Git repos for
/compiler and /docs, leaving the remaining framework to SVN. The
compiler repo contains various branches, while the docs repo only
contains the master branch - I only use it as a backup, in case another
SVN update will touch the docs.
DoDi
--
_______________________________________________
Lazarus mailing list
[email protected]
http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
