On Wed, Jul 4, 2012 at 11:20 AM, Andreas K. Huettel <andreas.huet...@ur.de> wrote: > > So for me I'd prefer merging Denis' commits into my branch... However, I see > the point that the rebasing makes sure the local patches always apply cleanly > to Denis' HEAD.
yes, that is the main reason we need to keep rebasing to his HEAD, otherwise there might be conflicts. Ideally, upstream developers should be the ones doing the core of the integration work, not the integrator (particuarly given that he doesn't have much time). -- --dmg --- Daniel M. German http://turingmachine.org ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Xournal-devel mailing list Xournal-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/xournal-devel
