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? > > 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 ???????????? ~/buc5 (master % u=) $ git checkout master ... OK somehow reasonable ~/buc5 (master % u=) $ git pull --rebase ?????????????????? mega@leafbuilder:~/leaf/devel/bering-uclibc$ git cherry maint ath-regdomain + ccc83a5ebd9448ddf2d36c72ba888102cc35ddac mhhh not very meaningful to me, but that is my fault mega@leafbuilder:~/leaf/devel/bering-uclibc$ git merge --no-commit ath-regdomain Updating 1253a90..ccc83a5 Fast-forward repo/linux/ath_regdomain_parameter.patch | 27 +++++++++++++++++++++++++++ repo/linux/buildtool.cfg | 6 ++++++ repo/linux/buildtool.mk | 1 + 3 files changed, 34 insertions(+) create mode 100644 repo/linux/ath_regdomain_parameter.patch OK looks like I was too much chicken, just having a repository which works is a small wonder to me ;-) Sorry for the noise Erich
smime.p7s
Description: S/MIME Cryptographic Signature
------------------------------------------------------------------------------ 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
