{"thread":{"id":"48151","subject":"FW: Merging in Git with Branches","startedAt":"2018-03-26T10:12:11Z","lastAt":"2018-03-26T10:49:14Z","messageCount":2,"participants":["shirlin.joseph@bt.com","Konstantin Khomoutov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"342984","messageId":"84fd5584332c450abe8b634921e7b568@rew09926dag15b.domain1.systemhost.net","threadId":"48151","inReplyTo":null,"subject":"FW: Merging in Git with Branches","fromName":"","fromEmail":"shirlin.joseph@bt.com","sentAt":"2018-03-26T10:12:04Z","receivedAt":"2018-03-26T10:12:11Z","isPatch":false,"sender":{"key":"shirlin.joseph@bt.com","avatar":null},"body":"\nHi Git team,\n\nI have a query.\n\nScenario:\nCurrently there are two main branches that we are utilizing A(master) and B(branch of A). Branch is utilised for individual stories(as per delivery).\n\nWhen branch is utilised since the team size is huge the number of changes/ branches created for different stories is huge and the common files changed are many.\n\nThus 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). It turns out to be mostly a manual merge.\n\n1. 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 consuming manual merge task?\n2. Can we automate it?\n\nRegards,\nShirlin.\n\n"},{"id":"342985","messageId":"20180326104855.cfdmgeleemexumin@tigra","threadId":"48151","inReplyTo":"84fd5584332c450abe8b634921e7b568@rew09926dag15b.domain1.systemhost.net","subject":"Re: FW: Merging in Git with Branches","fromName":"Konstantin Khomoutov","fromEmail":"kostix@bswap.ru","sentAt":"2018-03-26T10:48:55Z","receivedAt":"2018-03-26T10:49:14Z","isPatch":false,"sender":{"key":"kostix@bswap.ru","avatar":null},"body":"On Mon, Mar 26, 2018 at 10:12:04AM +0000, shirlin.joseph@bt.com wrote:\n\n[...]\n> Currently there are two main branches that we are utilizing A(master)\n> and B(branch of A). Branch is utilised for individual stories(as per\n> delivery).\n[...]\n\nCross-posted to [1] as well.\n\n1. https://groups.google.com/d/topic/git-users/nN_faSpd4A4/discussion\n\n"}]}