public void CreateMergeConflictScenario()
{
versionManager.CreateBranch("conflict-branch");
versionManager.Checkout("conflict-branch");
tutorialBox.GetActiveVersion().transform.position = new Vector2(10, tutorialBox.GetActiveVersion().transform.position.y);
versionManager.Add(tutorialBox);
versionManager.Commit("move the box");
versionManager.Checkout("master");
tutorialBox.GetActiveVersion().transform.position = new Vector2(20, tutorialBox.GetActiveVersion().transform.position.y);
versionManager.Add(tutorialBox);
versionManager.Commit("Change the box position");
versionManager.Merge(versionManager.LookupBranch("conflict-branch"));
tutorialBox.GetActiveVersion().transform.position = new Vector2(15, tutorialBox.GetActiveVersion().transform.position.y);
}
private void OnTriggerEnter2D(Collider2D other)
{
if (!shut)
{
if (other.gameObject.tag.Equals("Player"))
{
doorAnimator.SetBool("open", false);
// Commit the player's position because the door can't open again.
VersionController playerVersionController = other.gameObject.GetComponentInParent <VersionController>();
VersionManager manager = VersionManager.Instance();
manager.Add(playerVersionController);
manager.Commit("Left room", true);
UIController.Instance().UpdateOverlay();
GameObject.Find("AutocommitText").GetComponent <FlashText>().Flash();
shut = true;
}
}
}
