This was mostly a reminder :). This information was already on the wiki, and I edited the page to make it a bit more clearer.
Thanks, Alex On Thu, Jan 23, 2014 at 2:24 PM, Lerner, Dave <[email protected]>wrote: > Hello Alex, > If there are no objections, should we add this to the 'contribute to > toaster' page: https://wiki.yoctoproject.org/wiki/Contribute_to_Toaster ? > -Dave > > > -----Original Message----- > > From: [email protected] [mailto: > [email protected]] On > > Behalf Of Damian, Alexandru > > Sent: Thursday, January 23, 2014 6:26 AM > > To: [email protected] > > Subject: [Toaster] force updates and branch rebases > > > > Hello, > > > > > > It appears to me that it is inevitable to do rebases of > poky-contrib/toaster/master on > > top of the current origin/master at least once every week. This is > needed to prevent > > having the development trees diverge too much. > > > > > > As a result, I need to do forced push of the toaster/master, since > rebasing is > > not a history-clean operation. This should not impact your development, > but when you > > submit patches, please make sure that they are based on the top of the > latest poky- > > contrib/toaster/master. > > > > The preferred way > > to do this is to do a manual rebase of your development branch on top > of the > > toaster/master. This is different from Git's preferred way > > which is to merge your development branch and the upstream branch. > > > > > > To do this, please do not do "git pull". Git pull is just a shorthand > for "git fetch && > > git merge > > ". > > > > > > Please do, instead: > > > > $ git fetch --all > > > > $ git rebase -i poky-contrib/toaster/master # resolve any conflicts > here > > > > > > before pushing your development branch. > > > > > > > > Once I take a patch into the > > toaster/master branch, the history is locked into place. This is needed > to try to > > minimize the number of conflicts when rebase-ing as described above. > > > > > > > > This > > means that once your patchset makes it into toaster/master, you must > not push new > > variants of the patchset, but instead new patches on top of the current > toaster/master. > > > > > > Please let me know if you run into trouble with this procedure. > > > > > > Hope this helps, > > Alex > > > > > > -- > > > > Alex Damian > > Yocto Project > > > > SSG / OTC > -- Alex Damian Yocto Project SSG / OTC
_______________________________________________ toaster mailing list [email protected] https://lists.yoctoproject.org/listinfo/toaster
