6 Jan
2014
6 Jan
'14
12:06 p.m.
On 5 January 2014 12:00, Alex Shi alex.shi@linaro.org wrote:
so I guess if you get different it must be a git config issue.
yes, my git pull 'rebase = true' generate some conflicts.
You shouldn't be using pull --rebase for LSK unless there is a specific reason to do so - it means that what we're applying isn't exactly what got sent so we loose some history about what people sent us and also any testing they did on those specific revisions. If you do need to use --rebase remember to add your signoff to the commits you pulled in as it's just like applying patches.