Multiple people in remote repository- need guidance
Summary:
Need best practice from Oracle on two scenarios below so we do not have code conflicts.
Content (please ensure you mask any confidential information):
Scenario1
Day1- Core HR branch created in remote repo and used to make changes in local repo by user1. User1 uses 'Push' action to push these changes to remote repo/branch.
Day2- User2 goes in and uses CoreHR branch to make changes. This should not create any code conflicts as long as 'Push' is used again. Please respond to this sentence here.
Day3- Both user1 and user2 are making changes to different pages in CoreHR branch. As long as they 'Push' , no code conflicts will occur? Please respond to this sentence here.