[SyncEvolution] git merge strategy (was: RE: Alarms in the calendar: Evolution vs. vcal)
On Di, 2010-04-13 at 02:27 +0100, Zhu, Yongsheng wrote:
Hi, Tino
You're right! Thanks for your reminder.
Indeed, thanks for testing. Now "master" really contains the right
patches.
Patrick, it seems two patches are not merged into the master. I
re-push them to the branch 'mb10458'. Could you please merge them?
Yes, merged.
I think the reason why I (incorrectly) thought that this patch had
already been merged is that there is another patch with exactly the same
"Calendar: add workaround for 'alarm' in vCalendar1.0 (MB#10458)"
summary. But the older one is about DISPLAY DESCRIPTION, the new one
about alarm time.
As always when something goes wrong, we can learn from it. First, the
summary must be more specific, and/or we need different bug numbers.
Second, perhaps this whole rebasing thing isn't such a good idea after
all. We are doing it to keep history on "master" linear, but it is an
invitation for several mistakes:
* I rebase in order to merge while someone else works on the
branch.
* When I push the rebased branch, changes on the remote repo may
get lost (someone pushed further patches or I hadn't really
merged correctly).
Any opinions, anyone?
--
Best Regards
Patrick Ohly
Senior Software Engineer
Intel GmbH
Open Source Technology Center
Pützstr. 5 Phone: +49-228-2493652
53129 Bonn
Germany