Sign up now! · Forgot password?
RSS/Atom feed identi.ca Twitter

git problem

This discussion is connected to the gimp-docs-list.gnome.org mailing list which is provided by the GIMP developers and not related to gimpusers.com.

This is a read-only list on gimpusers.com so this discussion thread is read-only, too.

7 of 7 messages available
Toggle history

Please log in to manage your subscriptions.

git problem Marco Ciampa 06 Nov 20:21
  git problem Ulf-D. Ehlert 07 Nov 14:54
   git problem Marco Ciampa 07 Nov 18:25
    git problem Marco Ciampa 07 Nov 18:31
    git problem Ulf-D. Ehlert 08 Nov 14:41
     git problem Marco Ciampa 08 Nov 16:41
     git problem Marco Ciampa 12 Nov 12:27
Marco Ciampa
2009-11-06 20:21:09 UTC (over 4 years ago)

git problem

... beside from the fact that I'm not translating anything new due to the fact that one of the last git push destroied ~400 po italian messages (tell me if I'm wrong and why in case I'm doing something wrong myself...) now I'm stuck on git pull too. This is the error message:

error: Entry 'src/menus/edit/stroke-path.xml' not uptodate. Cannot merge.

please help

bye

Ulf-D. Ehlert
2009-11-07 14:54:35 UTC (over 4 years ago)

git problem

Marco Ciampa (Freitag, 6. November 2009, 20:21):

... beside from the fact that I'm not translating anything new due to the fact that one of the last git push destroied ~400 po italian messages (tell me if I'm wrong and why in case I'm doing something wrong myself...)

Don't panic! ;-) Can you give us an example of a lost(?) translation? Note that you can always get back your files with

git checkout [commit]

or (not tested)

git checkout [commit] po/it

where commit is e.g. HEAD^, HEAD^^, or a commit id like 76d2c40dcf... (Hmm, maybe it's better to create a local branch as backup before you try the 'git checkout' command...)

now I'm stuck on git pull too. This is the error message:

error: Entry 'src/menus/edit/stroke-path.xml' not uptodate. Cannot merge.

Try
git stash # saves changes and creates a # clean working directory
git pull
git stash pop # restores your changes

Bye, Ulf

Marco Ciampa
2009-11-07 18:25:04 UTC (over 4 years ago)

git problem

On Sat, Nov 07, 2009 at 02:54:35PM +0100, Ulf-D. Ehlert wrote:

Marco Ciampa (Freitag, 6. November 2009, 20:21):

... beside from the fact that I'm not translating anything new due to the fact that one of the last git push destroied ~400 po italian messages (tell me if I'm wrong and why in case I'm doing something wrong myself...)

Don't panic! ;-) Can you give us an example of a lost(?) translation? Note that you can always get back your files with

git checkout [commit]

or (not tested)

git checkout [commit] po/it

where commit is e.g. HEAD^, HEAD^^, or a commit id like 76d2c40dcf... (Hmm, maybe it's better to create a local branch as backup before you try the 'git checkout' command...)

now I'm stuck on git pull too. This is the error message:

error: Entry 'src/menus/edit/stroke-path.xml' not uptodate. Cannot merge.

Try
git stash # saves changes and creates a # clean working directory
git pull
git stash pop # restores your changes

Bye, Ulf

git stash
[...]
git stash pop
CONFLICT (delete/modify): po/de/concepts.po deleted in Stashed changes and modified in Updated upstream. Version Updated upstream of po/de/concepts.po left in tree.
Auto-merging src/menus/edit/stroke-path.xml marco@ciampix-lap2:~/git-gnome/gimp-help-2$ git status po/de/concepts.po: needs merge
# On branch master
# Changes to be committed:
# (use "git reset HEAD ..." to unstage) #
# modified: images/it/using/toolbox-description.png # modified: po/it/appendix.po
# modified: po/it/concepts.po
# modified: po/it/menus.po
# modified: po/it/menus/edit.po
# modified: po/it/menus/help.po
# modified: po/it/menus/image.po
# modified: po/it/menus/layer.po
# modified: po/it/menus/select.po
# modified: po/it/menus/view.po
# modified: po/it/preface.po
# modified: po/it/using.po
# modified: src/menus/edit/stroke-path.xml #
# Changed but not updated:
# (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working # directory)
#
# unmerged: po/de/concepts.po
#

stuck again! :-(

Marco Ciampa
2009-11-07 18:31:53 UTC (over 4 years ago)

git problem

On Sat, Nov 07, 2009 at 06:25:12PM +0100, Marco Ciampa wrote: [...]

# Changed but not updated:
# (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working # directory)
#
# unmerged: po/de/concepts.po
#

stuck again! :-(

Unpanic-ed...resolved with

git reset

ok now I'll go on updating...thank you to all...

Ulf-D. Ehlert
2009-11-08 14:41:28 UTC (over 4 years ago)

git problem

Marco Ciampa (Samstag, 7. November 2009, 18:25):

CONFLICT (delete/modify): po/de/concepts.po deleted in Stashed changes and modified in Updated upstream. Version Updated upstream of po/de/concepts.po left in tree.

Well done, git. No mercy if you tried to remove German po files. ;-)

Bye, Ulf

PS: What about a lost translation example?

Marco Ciampa
2009-11-08 16:41:35 UTC (over 4 years ago)

git problem

On Sun, Nov 08, 2009 at 02:41:28PM +0100, Ulf-D. Ehlert wrote:

Marco Ciampa (Samstag, 7. November 2009, 18:25):

CONFLICT (delete/modify): po/de/concepts.po deleted in Stashed changes and modified in Updated upstream. Version Updated upstream of po/de/concepts.po left in tree.

Well done, git. No mercy if you tried to remove German po files. ;-)

Well, it was not my intention to remove that file. It was just a try to remove the problem trying to recreate the conflicting file fresh from the repository while the removing of the file was NOT committed since it was not my intention of doing it, really. Then I've tried (with git pull) to recreate it but it did not worked as expected. I'm afraid that I'm subversion-ed minded and I've not completely grasped the git "philosophy", but I'm glad that git worked out my mistakes...

PS: What about a lost translation example?

Don't worry, I'm using this as an excuse to proofreading some pieces in the need of a revision. The most important thing now is that I'm not stuck and working. Many thanks and be patient with my rants. I'm actually remained the only active italian translator (and the starter of the italian project). :-)

bye

Marco Ciampa
2009-11-12 12:27:21 UTC (over 4 years ago)

git problem

On Sun, Nov 08, 2009 at 02:41:28PM +0100, Ulf-D. Ehlert wrote:

PS: What about a lost translation example?

All this was translated, as you can see...

http://docs.gimp.org/it/gimp-path-stroke.html

nevermind, I'm recovering it with cut & paste from the web and revisioning it at once...