Good Morning Pascal, I have seen your call to the translators for darktable 2.6 and would like to come back to the PR of the German translation.
In Github I don't see an error message at the end of PR 1739. In between there were some errors, but they are fixed. With the comments "merge with... ", "merge remote-tracking..." I have marked the commits after the command git fetch upstream (update my fork with darktable/master) I can't clean up the history with the commands you gave me. The last command "git push mepi0011 master" reports a missing permission. Can you please support me to bring the translation into darktable 2.6? The proofreaders and I have invested a lot of time in the translation and would be very happy if the translation goes online. Thanks Pierre Metzner Am Freitag, 23. November 2018, 11:37:47 CET schrieb Pascal Obry: > Hello Pierre, > > The link you sent is: > > https://github.com/darktable-org/darktable/pull/1739 > > At the bottom of the page I see error reported by GtiHub saying that > there is conflicts. > > Also your branch has multiple "merge with... ", "merge > remote-tracking..." > > To clean-up the history, and since you've committed on your master > branch: > > 1. update your darktable to latest version of master (git pull --rebase) > 2. resolve conflicts if any > 3. force push your branch : git push mepi0011 master > > Hope this helps. Thanks. ___________________________________________________________________________ darktable developer mailing list to unsubscribe send a mail to darktable-dev+unsubscr...@lists.darktable.org
