On Wed, 5 Nov 2014, Thomas D. wrote:
Hi,
Rainer, are you following some Git workflows currently?
Actual, the rsyslog commit history is quiet bad. You see many merges but
don't understand where they came from. They just appear ;)
If you are the only guy committing to master (=your feature branches are
*not* public), try to squash & rebase instead of doing a merge.
The feature branches are public in the adiscon git repository.
doing a squash will make it harder to bisect.
When I've looked at the git history, there are a lot of merges at the top of the
history because he develops on a feature branch, merges with the oldest
supported version, then merges up to the next version, then the next, etc. This
has the advantage that git does a lot of the conflict resolution for him as
changes creep in over versions, but does make for an uglier history.
As the -devel branch is dropped, I think it will help clean things up because
everything in the master won't be a merge from -devel (which is merges from
feature branches)
Rainer, instead of merging into the oldest supported version and then merging
from there to the latest, can you try merging the feature branch separately into
each supported version?
apologies if I'm misunderstanding your workflow.
David Lang
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of
sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE
THAT.
