[coreboot] [ANN] New code repository and development workflow

Peter Stuge peter at stuge.se
Mon Jun 6 10:51:46 CEST 2011

Gregg Levine wrote:
> how do I go about updating a properly cloned download from a git
> repository?

I recommend using:

git pull --rebase

git pull first does git fetch, then it does either git merge or
git rebase. Which of the second to use only matters if you have
changes committed to the local master branch. git merge creates a
merge commit to include these changes into the master branch. git
rebase will "unhook" the string of commands that you have made,
update to whatever the latest is on the coreboot.org server, and
finally try to re-apply the string of commits that you had made.
Usually this will be completely automatic, but if there are severe
conflicting changes (your local changes vs. the changes coming from
coreboot.org) then you will have to do manual conflict resolution.


More information about the coreboot mailing list