[X2Go-i18n] x2go-i18n Digest, Vol 23, Issue 1

[Mihai Moldovan]

On 10/03/2017 03:32 PM, martti pitkanen wrote:
> I am using git only in connection in connection with x2go translation.
> Can anybody tell my the git command by which I can merge repository with my
> local files,
> on which I have been working for previous release.

Note: this will delete any unstaged changes so that you are in a clean state
again and reset to the current master state.

Assuming you are in the git repository and on master branch:

git fetch
git reset --hard origin/master


Alternatively, an even easier way would be to fetch source file directly from
https://code.x2go.org/gitweb?p=x2goclient.git;a=blob_plain;f=res/i18n/x2goclient_fi.ts;hb=HEAD



Mihai

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 898 bytes
Desc: OpenPGP digital signature
URL: <http://lists.x2go.org/pipermail/x2go-i18n/attachments/20171003/96971bb7/attachment.sig>