git/list[1] front-page[2] threads[3] people[4] search[5] about
 

FW: Merging in Git with Branches

From
Sshirlin.joseph@bt.com <shirlin.joseph@bt.com>
Date
Mar 26, 2018, 10:12 UTC
Message-ID
<84fd5584332c450abe8b634921e7b568@rew09926dag15b.domain1.systemhost.net>
Hi Git team,
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 per delivery).

When 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.
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). It turns out to be mostly a manual merge.
1. 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?
2. Can we automate it?

Regards, Shirlin.

Next: Konstantin Khomoutov
Message 1 of 2 in “FW: Merging in Git with Branches”
  1. shirlin.joseph@bt.comMar 26, 2018
  2. Konstantin KhomoutovMar 26, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.