[Buildroot] [GIT PULL] avr32 updates

Peter Korsgaard jacmet at uclibc.org
Tue May 12 10:30:03 UTC 2009


>>>>> "Markus" == Markus Heidelberg <markus.heidelberg at web.de> writes:

Hi,

 >> No, if none of us modify the patch then the git sha1 id will be the
 >> same

 Markus> No, it will be different because of the different committer identity.

Yes ofcourse. I meant that the file (blob) id would be identical.

 Markus> If the changes are the same, there will be no merge conflict,
 Markus> it will be resolved automatically. But it won't ignore a
 Markus> commit, it will leave 2 commits with the same change in the
 Markus> repository, which may be confusing when browsing the history.

Yeah, but if people reply to the patches with a simple "applied to my
tree, thanks" - Then that shouldn't happen often ..

-- 
Bye, Peter Korsgaard


More information about the buildroot mailing list