* FW: Merging in Git with Branches
@ 2018-03-26 10:12 shirlin.joseph
2018-03-26 10:48 ` Konstantin Khomoutov
0 siblings, 1 reply; 2+ messages in thread
From: shirlin.joseph @ 2018-03-26 10:12 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: FW: Merging in Git with Branches
2018-03-26 10:12 FW: Merging in Git with Branches shirlin.joseph
@ 2018-03-26 10:48 ` Konstantin Khomoutov
0 siblings, 0 replies; 2+ messages in thread
From: Konstantin Khomoutov @ 2018-03-26 10:48 UTC (permalink / raw)
To: shirlin.joseph; +Cc: git
On Mon, Mar 26, 2018 at 10:12:04AM +0000, shirlin.joseph@bt.com wrote:
[...]
> 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).
[...]
Cross-posted to [1] as well.
1. https://groups.google.com/d/topic/git-users/nN_faSpd4A4/discussion
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-03-26 10:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-26 10:12 FW: Merging in Git with Branches shirlin.joseph
2018-03-26 10:48 ` Konstantin Khomoutov
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).