diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 50e3bd6..dffda0d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -73,3 +73,32 @@ After a pull request is approved, the branch should be deleted once merged. 6. Verify tests have passed CONGRATULATIONS! You have successfully contributed to the Dallas Software Developers website! Now just wait and see if your pull request is approved. + +## When your Pull Request is merged +That's Great, your work is well appreciated! If you would like to keep contributing, you should update your fork and update your local repository. + +## When your branch goes out of date + +This often happens and is mostly encountered after a pull request opened by another individual is merged to the `main` branch. Here are steps to follow if this happens: + +> You may choose to merge them the `main` branch on GitHub to your working branch which may be faster, but these steps are encouraged for a more linear-looking git history + +### Update your Fork + +1. Syncronize your Fork by going to your forked repository and ensure that you are on the `main` branch. You will see a message like { message } +2. Click { buttonName } and click **Update Branch** on the prompt that appears. + +### Update your local repository +1. Open a terminal in the directory of your local repository and run `git checkout main` to ensure you are on the `main` branch. +2. Run this command to update your local repository, you can read more about `git pull` [here](). +```bash +git pull --rebase +``` +3. Now checkout your working branch with `git checkout [branch_name]` and run: +```bash +git rebase main +``` +4. You may run into a merge conflict. If you do, [here's how to resolve them](), you have to do that before preceeding. + +### Force-push your changes +Run `git push --force` to update your remote branch and eventually, your pull request.