On Mon, 11 Jun 2012, Alexis López Zubieta wrote: > Hello: > > I have serious problems to upload my code to SourceForge, because my > country (Cuba) is blocked by U.S. government who forbids the access to > this site and I had to use a third party proxy to do it. > > So I'm asking you to synchronize the lxkb-config in sourceforge with my > repo in Github.
brother@l10n:git/lxkb_config/po (master)# git remote add upstream-github https://github.com/azubieta/lxkb_config.git brother@l10n:git/lxkb_config/po (master)# git remote update (..) brother@l10n:git/lxkb_config/po (master)# git merge upstream-github/master Auto-merging src/gtk+2.x_tab_page_others.c Auto-merging src/gtk+2.x_tab_page_layouts.c Removing resources/package_description.txt Auto-merging po/uk.po CONFLICT (add/add): Merge conflict in po/uk.po Removing po/src_list Auto-merging po/ru.po CONFLICT (content): Merge conflict in po/ru.po Auto-merging po/lxkb-config.pot Auto-merging po/lt.po CONFLICT (add/add): Merge conflict in po/lt.po Auto-merging po/es.po CONFLICT (content): Merge conflict in po/es.po Auto-merging nbproject/Package-Default.bash Removing nbproject/Package-Debug.bash Removing nbproject/Makefile-variables.mk Removing nbproject/Makefile-impl.mk Removing nbproject/Makefile-Release.mk Removing nbproject/Makefile-Debug.mk Removing Makefile Automatic merge failed; fix conflicts and then commit the result. So this failed and I am not super amused in doing merges for Russian, latvian and Spanish. I bailed. brother@l10n:git/lxkb_config/po (master *+|MERGING)# git merge --abort NEVER touch PO files, that is crucial. by checking out the individual commits I see the following. git show ca64814f5266e4492075f4fb224d1c6ed56c4d8d | diffstat [...] b/po/LINGUAS | 1 b/po/Makevars.template | 41 b/po/POTFILES.in | 2 b/po/es.gmo |binary b/po/es.po | 95 b/po/lt.gmo |binary b/po/lt.po | 81 b/po/lxkb-config.pot | 84 b/po/ru.gmo |binary b/po/ru.po | 90 b/po/uk.gmo |binary b/po/uk.po | 209 [...] Updating LINGUAS, POTFILES.in and lxkb-config.pot is all right and encouraged. Toouching PO files is not. EVER. Binary files should not be in the repo. git show 4a1332080fcb183fc13b718a15e03d87f17c6c34 | diffstat lt.po | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) commit 49d318e68b7996a0b7ca9c6092978b68379d770f Author: Alexis López Zubieta <[email protected]> Date: Tue May 22 11:08:47 2012 -0400 Package clean up. This is NOT a good commit message. Please be verbose in what you change... Also, the diffstat for that commit? 42 files changed, 1203 insertions(+), 28371 deletions(-) 28371 deletions? WTF!? 1203 insertions!? Crazy for ONE commit. The deletions is ofc the removal of junk files that shouldn't have been in the tree to begin with. Great things, but I had to look at the actual commit to figure that out, "package clean up" sure - true. But that would have been the short part of the commit message. And lastly from the tip section, add a line in .gitignore to remove backup files. Your git HEAD added configure.in~, 58 of 69 lines added in that commit was from that backup file. brother@l10n:git/lxkb_config (cuba-branch)# LC_ALL=C git status # On branch cuba-branch # Untracked files: # (use "git add <file>..." to include in what will be committed) # # roeven~ nothing added to commit but untracked files present (use "git add" to track) brother@l10n:git/lxkb_config (cuba-branch *)# LC_ALL=C git status # On branch cuba-branch # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: .gitignore # no changes added to commit (use "git add" and/or "git commit -a") root@l10n:/home/lxde/lxkb_config (cuba-branch *)# git diff diff --git a/.gitignore b/.gitignore index 0c3c287..4566bfd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ /nbproject/private/ /build/Debug/ /dist/Debug/ -/src/.deps/ \ No newline at end of file +/src/.deps/ +*~ By adding that line you CAN NOT commit your backup files. Not without actually wanting to do that at least. What to do to solve this situation? I will try clean up your master branch and will then apply them to our git HEAD at sourceforge. I will then push that to my github account so you can grab it from there. We need to work out a scheme for you to be able to contribute even though we have the git HEAD at SF.net =) If you want me to write more of these general tips and tricks in working with git and vcs in general please tell and I'll be happy to help. I have a workflow description in Swedish that I can translate to get you kickstarted in how I like to do things if you are not super comfortable with git (this offer could be extended to other curious people reading the list ofc =)). I know my way around git, by no means not an expert but I use it in my day job and pretty much know what to do and what not to do to not upset fellow developers in their workflow. -- /brother http://martin.bagge.nu Bruce Schneier expects the Spanish Inquisition. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Lxde-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/lxde-list
