On Donnerstag, 11. Juli 2019 03:02:04 CEST Brendan Coupe wrote: > That's what I thought but I thought some of the recent changes Thomas > made for me ended up in the 5.0 branch before they made it to the > Master branch.
Yes, that is true. Using git, one can merge a branch (A) into another (B). That means, that all changes in (A) go into (B). For KMyMoney at the moment I use 5.0 as (A) and master as (B). So far, we don't see massive conflicts as the code base is pretty similar. Using it the other way around, all changes of master (unstable) will end up in 5.0 (stable) which is not what I/we want as master already contains code that is not in a state I would call stable - even though it might be working w/o problems. There is more of it here on my local system which is not yet complete and sometimes not compilable/workable so I don't want to add that to master as of yet. So adding fixes of bugs to the 5.0 branch and merging 5.0 now and then back to master is what I/we do. If a fix goes into master and we want to have it on 5.0 we need to cherry-pick each one of them individually. Merging OTOH is one operation. See git log 8e49874f..ce17b1ee for such a cherry-pick example which happened lately. Hope that explains it. Note: I use 5.0 as my production environment and master for future development. You should probably do the same ;) Thomas -- Regards Thomas Baumgart https://www.signal.org/ Signal, the better WhatsApp ------------------------------------------------------------- BTW, just the planning of the test cases helped me to improve the code a lot. -- Alvaro Soliverez -------------------------------------------------------------
signature.asc
Description: This is a digitally signed message part.
