Integrating English commits #33
Description
@jnavila and others
As I am less experienced in using Git, I ask for advice on the following issue.
The way I see it, this repo is technically independent of the English progit2 repo. However, it is requested that the commits/patches there are also integrated into the translated German repo.
During the last days some minor patches were merged there. Up to now the integration was done completely manually.
What would be the best practice for
- no commit is to forget
- the author of the patch is preserved, if possible
- to perform an auto pull/fetch as good as possible
- by no means disrupting the translated German texts.