2010/11/4 Simos Xenitellis <simos.li...@googlemail.com> > > 2010/11/4 Александър Шопов <li...@kambanaria.org> > > > If you find a git expert who knows how to reconcile two branches who >> Not an expert, but won't >> >> git branch -m do the trick? >> http://www.dmo.ca/blog/20080307124544/ >> >> > As Claude mentioned, the two branches diverged quite a bit. > If you checkout from one branch to the other, it takes >10 seconds to > perform the switch, > because there are too many files that need to be changed. > > If you perform the standard git merge, you get > > $ git merge gcomprixogoo > warning: too many files (created: 473 deleted: 3781), skipping inexact > rename detection > warning: too many files (created: 2157 deleted: 5795), skipping inexact > rename detection > warning: Cannot merge binary files: gcompris.png (HEAD vs. gcomprixogoo) > warning: Cannot merge binary files: macosx/gcompris.png (HEAD vs. > gcomprixogoo) > CONFLICT (rename/delete): Rename > boards/draw/color-selector.png->src/anim-activity/resources/anim/color-selector.png > in gcomprixogoo and deleted in HEAD > CONFLICT (rename/delete): Rename > boards/draw/counter.png->src/anim-activity/resources/anim/counter.png in > gcomprixogoo and deleted in HEAD > CONFLICT (rename/delete): Rename > boards/draw/down.png->src/anim-activity/resources/anim/down.png in > gcomprixogoo and deleted in HEAD > CONFLICT (rename/delete): Rename > boards/draw/tool-circle.png->src/anim-activity/resources/anim/tool-circle.png > in gcomprixogoo and deleted in HEAD > CONFLICT (rename/delete): Rename > boards/draw/tool-circle_on.png->src/anim-activity/resources/anim/tool-circle_on.png > in gcomprixogoo and deleted in HEAD > CONFLICT (rename/delete): Rename > boards/draw/tool-del.png->src/anim-activity/resources/anim/tool-del.png in > gcomprixogoo and deleted in HEAD > CONFLICT (rename/delete): Rename > boards/draw/tool-del_on.png->src/anim-activity/resources/anim/tool-del_on.png > in gcomprixogoo and deleted in HEAD > .... many more .... > Auto-merging src/gcompris/timer.h > CONFLICT (content): Merge conflict in src/gcompris/timer.h > Auto-merging src/gcompris/wordlist.c > Auto-merging src/gcompris/wordlist.h > Auto-merging tools/gcompris_shapegame.py > CONFLICT (content): Merge conflict in tools/gcompris_shapegame.py > Automatic merge failed; fix conflicts and then commit the result. > $ _ > > which means that it requires quite a bit of manual labor. > > I now read the URL you gave earlier. It suggests to rename the gcomprixogoo branch to master (and get rid of the old master). The only concern for this is what happens to those that already have a copy of the repository. Would those with a copy of the repository be able to pull with 'git pull' and update as normal? If it is possible, then this is the way to go.
Simos
_______________________________________________ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n
