Project Directory:

Project_Core_Engineering 1. This Directory should be GIT initiated.

2. Configure user.name as NTTData
3. Configure user.email as your email
address for NTTData
4. Configuration should be done globally.
5. Make sure repository should ignore
logfiles and jar files to do versioning
6. Create a sample file inside the Project
Client Machine (Installed the GIT)
Directory. Name of the sample file will
be NTTData.assignments.
7. Push the First Version into GITHUB
Repository.

Branching and Merging Activity:

Stashing Activity:
Create the Branch name
Staging_Features. Stash the
changes in
Stashing_Features branch
apply the stash to the
Master Branch and commit
the changes from the Master
Branch.
Rebase and Merging Activity and CherryPick:
1. Create the Branch Core_EnGineering_Feature and try
to rebase that Branch with the Master.
2. Note down the commit ID in both the cases before
rebasing and after rebasing of master and branch.
3. Resolve the Merge Conflict error while doing the
Rebase Activity.
4. After resolving the conflict create one more branch
from master and demonstrate the cherry-pick activity
with the help of new branch. (Give your favorite name
to the branch and perform this activity.
1. Create the Branch Name as:
NTTDataProject_Feature
2. Note down the commit ID of Master
Branch and NTTDataProject_Feature.
3. Do the activity of Merging and
Provide the output merging is
successful. It could be FF and True
Merge or it could be Recursive.
4. Resolve the Merge Conflict with the
help of DiffMerge Tool.