Skip to content

Group7A/CEN3031-GitWorkflowTest

 
 

Folders and files

NameName
Last commit message
Last commit date

Latest commit

 

History

17 Commits
 
 
 
 
 
 
 
 
 
 
 
 

Repository files navigation

CEN3031-GitWorkflow - Merge Conflicts

This repo is meant to be used as a template for Discussion Session 3 - Git WorkFlow

Scenario 1: 2 developers are working on a feature and their is a conflict at the feature branch level.

Scenario 2: 2 independent features are being developed by 2 groups of 2 developers each. One group merges the feature in development and the second group tries to merge but get a conflict stating the changes are not recent. They pull from development and a conflict occurs.

Image

About

This repo will showcase merge or merge conflicts

Resources

Stars

Watchers

Forks

Releases

No releases published

Packages

No packages published

Languages

  • HTML 51.8%
  • JavaScript 48.2%