Re: FW: Merging in Git with Branches

2018-03-26 Thread Konstantin Khomoutov 
On Mon, Mar 26, 2018 at 10:12:04AM +, shirlin.jos...@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

FW: Merging in Git with Branches

2018-03-26 Thread shirlin.joseph 

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.