Hi Sergei, Regarding the "help/teaching"... were you referring to the diff/patch part and working with github or the process of merging and tagging a new release?
In case you aren't yet familiar with the git workflow, the diff/patch process is pretty straightforward: 1. Login to your github account, go to the URI https://github.com/openxpki/openxpki and click on the "fork" button to create your own copy of the openxpki repository on github. 2. On your own computer, run the following to create a local working copy of your github copy: # adjust to your local preference for directory names cd ~/git # this assumes that 'svysh' is your ID on github git clone [email protected]:svysh/openxpki.git cd openxpki 3. Check out the branch you wish to work on. This will typically be either "develop" or a feature branch based on "develop". # option 1 git checkout develop # option 2 git checkout -b feature/fix-po-error develop 4. Make your changes to the local files 5. Commit the changes to your current branch # get a list of the changed files git status # add names of modified files for your commit git add <list of changed files from above command> # commit git commit -m '<your commit message>' # push the commit to your github repository git push origin <name of current branch> 6. On github, navigate to the branch with the commit you just pushed and create a 'pull request'. Typically, pull requests get merged relatively quickly--you could just push directly to the main repository, but we've been trying to stick to the "peer review" workflow in order to improve code quality. For creating a new release, it's basically just a matter of following a similar workflow to above, but use 'git merge' to bring the commits in the "develop" branch into the "master" branch. Then, the head of the "master" branch is tagged with the latest release number and the branch is pushed to github. Please feel free to ask if you have any questions or run into any difficulties. When I switched from cvs/subversion, I found git rather awkward in the beginning. It was very helpful for me to pick Martin's brain during that transition. CU, Scott On Aug 4, 2014, at 8:44, Sergei Vyshenski <[email protected]> wrote: > > > Attached file contains fixed version of all 3 translations with corrections > as specified below. > Here I edited translations taken from today's development branch. > > Could you please help me and prepare a new "release" on master branch with > these corrections, of maybe you prefer to teach me to do it myself. > ------------------------------------------------------------------------------ Infragistics Professional Build stunning WinForms apps today! Reboot your WinForms applications with our WinForms controls. Build a bridge from your legacy apps to the future. http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk _______________________________________________ OpenXPKI-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openxpki-devel
