Question 320:
You are developing a product that has multiple versions. The product must be supported for an extended period. You are using GitHub and have two branches created, ‘feature1’ and ‘feature2’ along with the main branch. A bug was reported and fixed in ‘feature2’ and later merged to the master branch. Later it was discovered that the same bug existed in ‘feature1’ as well, and it needs to be fixed. You need to ensure that the change is backported from master to ‘feature1’ branch. What should be the best way to fix this?
Answer options:
A.Merge B.Cherry pick C.Rebase D.Squash merge