This is a training exercise to practice indentifying and resolving conflicts in Git. It is a Node/Typescript project.
Please note that lots of the code in this repo is deliberately overly verbose and inefficient. This is to generate some more intersting conflicts - I would not suggest using any of the code here if your objective is just to calculate Fibonacci numbers! I've also tried to use a mixture of syntax and approaches so that those unfamiliar with TS/JS get a bit more exposure to some simple tools that are available in the language.
- Fork this repository so that you can push the results of your work to your own personal GitHub and practice raising PRs without affecting other people. Make sure to fork all branches, not just main.
- Clone the fork.
- Open the project with an editor of your choice (VS Code recommended).
- Ensure you have Node.js >= v16 installed
- Install the dependencies with
npm install - Run the tests with
npm run test
This repository has several branches. Your task is to combine them into one that will contain the features of all of them. Beware - conflicts lie ahead (that is, after all, the main point of the exercise)!
This exercise will be most effective if you merge the branches in the order described below:
- handle-negatives
- handle-null
- compute-array
- optional-recursion
- negative-recursion
- variable-names
This is not the easiest order in which to merge the branches. However, this approach leads to the most interesting conflicts and is a good reflection of reality where feature branches aren't necessarily always merged in the most convenient order.
All branches include tests. Conveniently, whoever wrote the tests (:eyes:) made sure that they are all in different files, so there should be no conflicts there.
Tests are always supposed to be right and you should not need to edit them at any point to make them pass.
The goal state of this exercise is a main branch that contains all of the features that are currently split onto separate feature branches. You should not have to write or modify any code outside of the merge conflict resolution process.
To get familiar with git and remote git repositories, there are several different approaches you can take to resolving these conflicts. I'd recommend working through them in order - the first one is the most refective of the standard development process on a multi-developer project, but the others are great practice.
Before starting to resolve the conflicts on each branch, it's a good idea to take a look through the changes and make sure you understand how the new code and test(s) on the branch work.
- The PR/rebase approach. For each branch:
- Create a pull request ("PR") for a feature branch (make sure to make this against your own version of the repository, not my copy that you forked it from)
- Most of the time, it won't let you merge it because of a conflict
- Locally, pull an up-to-date version of
mainand rebase the feature branch on top of it, resolving any conflicts as they arise - Force push your feature branch. It should now be possible to merge the PR that you previously created
- Note: Force pushing is quite dangerous, and you shouldn't get into the habit of doing it other than for this specific case where a branch has been rebased and you need to update the remove version. In many remote repositories, the
main/masterbranch is protected against force pushing for this reason.
- Note: Force pushing is quite dangerous, and you shouldn't get into the habit of doing it other than for this specific case where a branch has been rebased and you need to update the remove version. In many remote repositories, the
- Without using GitHub, get all of the features on to the
mainbranch only usinggit mergecommands. - Without using GitHub, get all of the features onto a single branch only using
git rebasecommands (this branch doesn't have to bemain).
After each run-through, you will want to revert your repository back to its starting state. You might want to explore ways of doing this (without re-forking the original repo), for example:
- adding remote to the original repo and resetting
--hard - reflog (git reference logs)