Le 15 oct. 2014 à 22:25, Erich Titl <erich.t...@think.ch> a écrit :
> Hi KP > > on 15.10.2014 20:07, kp kirchdoerfer wrote: >> Hi Erich; >> > ... > >> >> I'm pretty shure you can merge, without forcing others to follow your pathes >> - >> otherwise git would be a desaster. > > Igitt Igitt :-) > >> >> Pls show us where your merge fails and I'm shure we can help. > > ath-regdomain is branched off maint > > mega@leafbuilder:~/leaf/devel/bering-uclibc$ git branch > * ath-regdomain > maint > master > > mega@leafbuilder:~/leaf/devel/bering-uclibc$ git status > # On branch ath-regdomain > # Changes not staged for commit: > # (use "git add/rm <file>..." to update what will be committed) > # (use "git checkout -- <file>..." to discard changes in working > directory) > # > # deleted: conf/sources.d/uboot.cfg > # > # Untracked files: > # (use "git add <file>..." to include in what will be committed) > # > # conf/sources.d/uboot.cfg.disabled > no changes added to commit (use "git add" and/or "git commit -a") > > Now that I have deleted conf/sources.d/uboot.cfg what happens to maint. > This change is not committed so does it affect the merge? Use for example the git stash command to temporary "remove" the local change. You can also use 2 branches, the one wirh the modification you made in the code and another one to test the compilation (with uboot disable). When you want to test the compilation merge (or rebase) the other branch into the "compilation branch". > >> >> See also >> "merging maint into master " from 15.01.2013 on leaf-devel to get an idea.. > > Mhhh looked it up, looks even worse than my scenario :-( > > Actually my git repository is error free, I am a bit reluctant to use > Ive's commands as I have no idea what state the repository will be in if > anything fails. > > It would be helpful to know _why_ we need this sequence > > ~/buc5 (master % u=) $ git fetch --all ???????????? To retrieve all the datas from the remote repository into your local repository > ~/buc5 (master % u=) $ git checkout master ... OK somehow reasonable To change the working branch > ~/buc5 (master % u=) $ git pull --rebase ?????????????????? To rebase your local branch from the remote repository (be in sync). Regards, Yves ------------------------------------------------------------------------------ Comprehensive Server Monitoring with Site24x7. Monitor 10 servers for $9/Month. Get alerted through email, SMS, voice calls or mobile push notifications. Take corrective actions from your mobile device. http://p.sf.net/sfu/Zoho _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
