On 11/11/13 08:03, Vincent van Ravesteijn wrote: > First of all, it wouldn't be necessary to merge with master over and > over again. Chances are not that big that master is now interfering > with your feature, so don't bother.
I just realized that the features/chat branch in .git/config has "rebase=true", so probably when I pull it's rebased anyway :-). I think I followed literally instructions at http://wiki.lyx.org/Devel/LyXGit#toc5 to create it. > Second, if you want to incorporate changes from master, you should > merge master into your feature. Whenever you want to merge your > feature back into master, you can rebase onto master and these merges > will disappear. interesting thought: what is the difference between (assume I'm in my feature branch) $ git merge origin master (or origin/master, whatever syntax merge is fine with) $ git pull origin master ? Thx. T.
