Important Notice: Our web hosting provider recently started charging us for additional visits, which was unexpected. In response, we're seeking donations. Depending on the situation, we may explore different monetization options for our Community and Expert Contributors. It's crucial to provide more returns for their expertise and offer more Expert Validated Answers or AI Validated Answers. Learn more about our hosting issue here.

I read it was possible to export the merge of two branches using a GNU patch style –ifdef format, how does that work?

April 26, 2017branches export format GNU merge patch possible read style

0

10 Posted

I read it was possible to export the merge of two branches using a GNU patch style –ifdef format, how does that work?

1 Answer

0

10 Posted

Well, implementation details aside the options –merge –ifdef are what you require. It is important to note that although DForce knows how to produce correct output for C/C++/m4/shell scripts/ruby/perl it is up to the user to make sure they are handled correctly. With C/C++ this is simple, just adding -D to CFLAGS should always produce the desired results. With, for example, shell scripts you must choose how to define the variable.