Dne 2.12.2017 v 02:35 Kevin Kofler napsal(a): > Vít Ondruch wrote: >> This is big and old-school hammer. If you did "git cherry-pick" instead, >> you could get most of the changes you did in master without the >> branches. Also, merging means that you get into older (or EPEL) branches >> stuff like changelogs from mass rebuild, which should not be there IMO. > Cherry-picking and diverging changelogs mean one keeps having to manually > fix conflicts. This is not true. You have to fix it just once and the following changelog entries will apply cleanly. V. _______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
