Am Donnerstag, 15. März 2012 um 13:37:11, schrieb Vincent van Ravesteijn <v...@lyx.org> > Op 15-3-2012 13:25, Kornel Benko schreef: > > Am Donnerstag, 15. März 2012 um 12:11:37, schrieb Vincent van > > Ravesteijn<v...@lyx.org> > >> Op 15-3-2012 2:23, uwesto...@lyx.org schreef: > >>> Author: Uwe Stöhr<uwesto...@lyx.org> > >>> Date: Thu, 15 Mar 2012 02:22:15 +0100 > >>> New Commit: 0e271180f91603a8547b652dd3da1e8f4deb8375 > >>> URL: > >>> http://git.lyx.org/?p=lyx.git;a=commit;h271180f91603a8547b652dd3da1e8f4deb8375 > >>> > >>> Log: > >>> Merge branch '2.0.x' of git.lyx.org:lyx into 2.0.x > >>> > >> This has probably be caused by committing locally directly onto the > >> 2.0.x branch and doing a git pull afterwards. > >> > >> The easiest to do is _not_ to commit locally onto the master or 2.0.x > >> branch. First create a branch: > >> > >> git checkout -b myfeature % create a branch 'myfeature' > >> git add<files> > >> git commit % commit onto the branch myfeature > >> > >> When you want to push your changes to the lyx repo: > >> > >> git pull % sync your repo first > >> > >> git merge myfeature % assuming you're on 2.0.x or master branch > >> --or-- > >> git checkout myfeature > >> git rebase 2.0.x --or-- git rebase master > >> git push > >> > > I did the second, but the commit is _not_ part of master, only in this shit > > branch. > > This was the sentence: > > git checkout -b cmake > > git commit > > git pull > > git rebase master > > git checkout master > > git pull > > --> Changes are not there > > Sorry, after the rebase, the cmake branch is on top of master. After > 'git checkout master' you can do 'git merge cmake'. Now, the master > branch will be fast-forwared to cmake. This mean that the commits in the > cmake branch are added linearly to master. > > Vincent
But then, why the need for a branch? I don't understand. It is more and more
confusing.
Kornel
signature.asc
Description: This is a digitally signed message part.
