Git Project

Preliminaries

1. Fork this repo by clicking Fork in the top-right corner of the page. Make sure you fork ALL branches, not only main.
2. Clone your forked repository by:

   git clone https://github.com/<your-username>/<your-project-repo-name>

   Change <your-username> and <your-project-repo-name> according to your GitHub username and the name you gave to your fork. E.g. git clone https://github.com/johndoe/GitProject.

Let's get started...

Part I: Branches

Create the following git commit tree. You can add any file you want in each commit, but the message for each commit must be exactly the same as denoted in the below graph (c1, c2,..., c12). Note the (lightweight) tags in commit c8.

The parent commit of c1 must be the last commit in branch main after a fresh clone of this repo (commit with message start here).

gitGraph
       commit id: "c1"
       branch arik/bugfix1
       commit id: "c10"
       commit id: "c11"
       checkout main
       commit id: "c2"
       branch john/feature1
       checkout john/feature1
       commit id: "c3"
       checkout main
       merge arik/bugfix1 tag: "v1.0.2"
       checkout john/feature1
       branch john/feature1-test
       checkout john/feature1-test
       commit id: "c5"
       checkout main
       commit id: "c6"
       checkout john/feature1
       commit id: "c7"
       checkout main
       merge john/feature1 tag: "v1.0.3"
       checkout john/feature1-test
       commit id: "c8" tag: "john-only"
       checkout main
       commit id: "c9"

Loading

Notes:

• If you've messed up the repo, you can always checkout branch main and run git reset --hard <commit-id> where <commit-id> is the commit hash from which you need to start.
• By default, your tags aren't being pushed to remote. Make sure to push your tags using the --tags flag in the git push command.

Test it locally

git checkout main
cd test
bash branches.sh

Part II: Merge conflict

It's highly recommended to use a conflict merge tool (like the built-in one in PyCharm or VSCode).

Your team colleagues, John Doe and Narayan Nadella, are working together on the same task. Each one of them is working on his own git branch.

• John Doe developed under origin/feature/version1 branch.
• Narayan Nadella developed under origin/feature/version2 branch.

Both checked out from the same main branch.

You decide to create a new branch called feature/myfeature and merge the work of John and Narayan into your branch. When done this you encountered a conflict.

1. From mian branch, create and checkout feature/myfeature branch.
2. Merge origin/feature/version1 into your branch, take a look on the merge changes.
3. Merge origin/feature/version2 into your branch, and resolve the conflicts according to the below guidelines:
   • The flask webserver code under app.py should have a total of 8 endpoints in the following order: /, /status, /blog, /pricing, /contact, /chat, /services, /internal.
   • Narayan mistakenly has coded a bad port number for the service, John's branch port is correct.
   • Narayan knows better than John about the price of the service.

Test it locally

git checkout main
cd test
bash conflict.sh

Part III: Pre-commit and sensitive data

In this repo, there is a commit which contains credentials of strong identity in AWS. The file contains the credentials might look like:

AWS_ACCESS_KEY_ID=AKIA6BJMA3TKBADSHFXZ
AWS_SECRET_ACCESS_KEY=op7N48fxIFxh06ToUwZd33emso/QKZWb/2M5fgTX

Your goal is to find this commit, and completely remove it from the history.

Here is an illustration of the vulnerable commit (the true branch name is not some_branch):

gitGraph
       branch some_branch
       checkout some_branch
       commit id: "commit1"
       commit id: "VULNERABLE_COMMIT"
       commit id: "commit 2"
       commit id: "commit 3"

Loading

And after your fix:

gitGraph
       branch some_branch
       checkout some_branch
       commit id: "commit1"
       commit id: "some other commit 2"
       commit id: "some other commit 3"

Loading

Note that the commits coming before the vulnerable commit should remain untouched (like commit1), while commit coming after the vulnerable commit might change (like some other commit 2 and some other commit 3, instead of commit 2 and commit 3).

Commit-wise, you are free to do whatever you wish for the commits that are coming after the vulnerable commit, as far as the content of the branch remain the same. The branch content should be identical to what it was before your fix, except the vulnerable file that was committed in the VULNERABLE_COMMIT commit.

There are many approaches to solve it, some are using git reset --hard, git rebase or git cherry-pick. Find your preferred way. You should find the branch contains the vulnerable data, learn its structure and data, and remove the vulnerable commit carefully, without loosing data committed in other commits.

The commit shouldn't be found also in remote branches. Since you've changed the commit history, you may be needing to --forcefully push your fixed branch to remote.

In order to prevent this vulnerability in the future, integrate pre commit into your repo, and add a plugin that blocks any commits that contains AWS credentials data. Verify that the tool is working - try to commit the below text and make sure pre-commit is blocking you. If you were able to commit it, git reset your working branch to the commit before the vulnerable commit, and try again.

Test it locally

git checkout main
bash test/sensitive_data.sh

Part IV: Merge two git repositories

In a company implementing typical DevOps pipelines, different teams may be responsible for developing separate microservices of a larger application, each residing in its own Git repository. You have been assigned the task of merging two different Git repositories, each containing separate microservice, into a single monorepo. The repositories were maintained by separate teams and have separate commit histories. Your goal is to preserve the entire commit history of both repositories while merging the code into a single Git repository, ensuring that the microservices remain functional and properly integrated with each other.

Merge the GitProjectAnother repo into your main GitProject repo. The main branch of the resulted repo should have the following file structure:

GitProject
└── serviceA/
        ├── [service A files...]
    serviceB/
        └── [service B files...]

Notes

• Feel free to make changes to any files in the GitProjectAnother repository that are not located under the serviceB directory.
• Once the history of the GitProjectAnother repository has been successfully merged into this repository, feel free to make any additional changes, such as moving files into different directories.
• In case of conflicts during the merge, you should prefer this repo's version.

Test it locally

git checkout main
cd test
bash merge_repos.sh

Submission

Time to submit your solution for testing.

1. Commit and push your changes. Make sure you push involved branches, not only main.
2. In GitHub Actions, watch the Project auto-testing workflow (enable Actions if needed). If there are any failures, click on the failed job and read the test logs carefully. Fix your solution, commit and push again.

Share your project

You are highly encourages to share your project with others by creating a Pull Request.

Create a Pull Request from your repo, branch main (e.g. johndoe/GitProject) into our project repo (i.e. exit-zero-academy/GitProject), branch main.
Feel free to explore other's pull requests to discover different solution approaches.

As it's only an exercise, we may not approve your pull request (approval would lead your changes to be merged into our original project).

Good Luck