Mailing-List: contact dev-help@syncope.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@syncope.apache.org
From: ilgrosso <git@git.apache.org>
To: dev@syncope.apache.org
Reply-To: dev@syncope.apache.org
References: <git-pr-32-syncope@git.apache.org>
In-Reply-To: <git-pr-32-syncope@git.apache.org>
Subject: [GitHub] syncope issue #32: [SYNCOPE-828] Russian translation for admin console
Content-Type: text/plain
Message-Id: <20160808081051.801E5EE68D@git1-us-west.apache.org>
Date: Mon,  8 Aug 2016 08:10:51 +0000 (UTC)
archived-at: Mon, 08 Aug 2016 08:10:53 -0000

Github user ilgrosso commented on the issue:

    https://github.com/apache/syncope/pull/32
  
    Hi @securny, thanks for your work!
    
    There are unfortunately some issues in merging this PR, due to some nasty conflicts.
    
    I would suggest to:
    
    1. close this PR
    2. align your own fork's master branch with latest changes from syncope master branch
    3. create new branch from your now-aligned master branch
    4. unzip [patch-32.zip](https://github.com/apache/syncope/files/406325/patch-32.zip) and apply the contained diff via `patch -p1 < 32.diff`
    5. open new PR from this newly created branch
    
    I can naturally apply the elaborated diff by myself (and thus you could skip all such procedure), but this way I will lost your commit authorship (I could name you in the commit log, but anyway...)
    
    
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---