[libvoikko] grammar checker checks
Harri Pitkänen
hatapitk at iki.fi
Thu Sep 19 17:36:48 EEST 2013
On Thursday 19 September 2013 14:04:22 Kevin Brubeck Unhammer wrote:
> Francis Tyers <ftyers at prompsit.com> writes:
>
> [...]
>
> > My github username is 'ftyers'. This is the first time I've used git --
> > I'm more used to SVN. Is there a way I can just work in a branch ? And
> > then we can merge in when necessary ? It's unlikely that I'll be working
> > outside of the src/grammar directory anyway.
>
> after checking out the repo, create new branch like this:
> $ git checkout -b name-of-new-branch
>
> switch back to master branch:
> $ git checkout master
>
> switch back to new branch:
> $ git checkout name-of-new-branch
>
> after committing stuff to new branch, upload those commits (creating the
> new branch in the remote repo if it doesn't already exist)
> $ git push origin name-of-new-branch
Or if you prefer using SVN you could just
* Log in to GitHub web interface and go to
https://github.com/voikko/corevoikko
* Click "Fork" at the upper right corner and wait until the repository has
been forked
* Run
svn co https://github.com/ftyers/corevoikko/trunk corevoikko
to check out your forked copy with SVN.
* Now you can do SVN commits in this repository just as you would normally
do.
* Once you think your changes are ready to be merged, point your web browser
at https://github.com/ftyers/corevoikko, make sure you are logged in and
click the grey "Pull request" icon just above your latest commit message.
Follow the instructions to review and send the pull request.
I will receive an email about your pull request. I can then merge it with a
single mouse click.
For this workflow you don't even need push access to the repository so there
is no risk of accidentally breaking anything. I think this is also quite
convenient. If you use SVN elsewhere and Git in one project you start soon
mixing the commands. I suffer from this as I still have to use SVN at work...
Harri
More information about the Libvoikko
mailing list