Le 5 oct. 2012 à 19:07, Erich Titl a écrit : > Hi Folks > > I have gotten at a point where I want to push my stuff. > > @Yves could you have a look at my merge output to just _guess_ if it > looks OK > > mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git branch > maint > master > * nameif > mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git checkout maint > M conf/.gitignore > M conf/buildtool.conf > Switched to branch "maint" > mega@luna:~/leaf/devel/leaf.new/bering-uclibc> git merge nameif > Auto-merged conf/sources.cfg > Merge made by recursive. > conf/sources.cfg | 11 ++++++ > repo/bbnameif/buildtool.cfg | 75 > +++++++++++++++++++++++++++++++++++++++++++ > repo/bbnameif/buildtool.mk | 31 ++++++++++++++++++ > repo/bbnameif/mactab | 6 +++ > repo/bbnameif/mactab.tmp | 8 ++++ > repo/bbnameif/nameif | 38 ++++++++++++++++++++++ > repo/busybox/.config | 4 +- > 7 files changed, 171 insertions(+), 2 deletions(-) > create mode 100644 repo/bbnameif/buildtool.cfg > create mode 100644 repo/bbnameif/buildtool.mk > create mode 100644 repo/bbnameif/mactab > create mode 100644 repo/bbnameif/mactab.tmp > create mode 100644 repo/bbnameif/nameif > > This is how the log looks > > commit a9ab81c9ea572139a01649b33989ef0e2624497f > Merge: 5424f54... 4cbad44... > Author: mega <erich.t...@think.ch> > Date: Fri Oct 5 19:02:13 2012 +0200 > > Merge branch 'nameif' into maint
Hi Erich, No it's not good because the merge must result into a fast forward and not a merge commit. First reset the maint branch: git checkout maint git fetch git reset --hard origin/maint Then you must rebase your nameif branch from maint: git checkout nameif git rebase maint And resolv conflicts. After that go to the maint branch: git checkout maint and do a git diff nameif to see if what you want to add is good after that you can merge your branch into maint and it will result to a fast-forward: git merge nameif Yves ------------------------------------------------------------------------------ Don't let slow site performance ruin your business. Deploy New Relic APM Deploy New Relic app performance management and know exactly what is happening inside your Ruby, Python, PHP, Java, and .NET app Try New Relic at no cost today and get our sweet Data Nerd shirt too! http://p.sf.net/sfu/newrelic-dev2dev _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
