On 07/22/2009 12:00 PM, Belisko Marek wrote: > I try clone it yesterday and today update with git pull but get many conflicts. > > Should I use git pull or git remote update for updating local tree? You may rebase on the top of each day -next. Something like remote update rebase origin/master my_branch where origin is -next remote branch. my_branch is your branch with the changes.
