Shirlin Joseph <[email protected]> writes:
I have a query. Scenario:Currently there are two main branches that we are utilizing A(master) and B(branch of A). Branch is utilised for individual stories(as perdelivery).When branch is utilised since the team size is huge the number of changes/ branches created for different stories is huge and the commonfiles changed are many.Thus when the story for branch A is completed and merge request is raised, since the branch is not up-to-date with the A(master). Itturns out to be mostly a manual merge.Is there a better way to handle the scenario of the branch not being up-to-date with the master and the merge becoming a time consumingmanual merge task? Can we automate it?
As Konstantin answered in another email, short-lived branches are much easier to deal with and should be strived for. If that's not possible, merge often between the branches. If that's not possible either, check
out git-imerge[1]. /M [1]: https://github.com/mhagger/git-imerge -- Magnus Therning OpenPGP: 0x927912051716CE39 email: [email protected] jabber: [email protected] twitter: magthe http://therning.org/magnus Action is the foundational key to all success. — Pablo Picasso -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
signature.asc
Description: PGP signature
