cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-08 05:54:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

added procedure to manage customizations

Browse Source
This commit is contained in:
Sean Howard 2024-06-03 11:37:06 -06:00
parent ed59d08ec3
commit 065cc4653b
1 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
GIT_MANAGE.md Normal file
View File

@ -0,0 +1,47 @@
Fork the Repository: Fork the original repository on GitHub (or whichever platform it's hosted on). This creates a copy of the repository under your GitHub account.
Clone Your Fork: Clone the forked repository to your local machine using Git. This will be your working directory for making changes.
bash
Copy code
git clone <your_forked_repository_url>
Create a New Branch: Create a new branch for your customization work. This helps keep your changes separate from the original codebase.
bash
Copy code
git checkout -b my-customization
Make Your Customizations: Modify the code as per your requirements. You can add new features, fix bugs, or make any changes you need.
Commit Your Changes: Once you're done with your customizations, commit your changes to the local repository.
bash
Copy code
git add .
git commit -m "Customizations for my needs"
Push Changes to Your Fork: Push your changes to your forked repository on GitHub.
bash
Copy code
git push origin my-customization
Submit Pull Request: Go to your forked repository on GitHub, switch to the branch containing your customizations, and click on the "New Pull Request" button. This will allow you to create a pull request to merge your changes into the original repository.
Keep Your Fork Updated: To incorporate updates from the original repository, you need to sync your fork with the upstream repository. Add the original repository as a remote and fetch updates from it.
bash
Copy code
git remote add upstream <original_repository_url>
git fetch upstream
Merge Changes from Upstream: Once you have fetched updates from the original repository, you can merge those changes into your local branch.
bash
Copy code
git checkout my-customization
git merge upstream/main
Resolve Conflicts (if any): If there are any conflicts between your changes and the updates from the original repository, resolve them manually.
Push Changes to Your Fork: After resolving conflicts, push the changes to your forked repository.
bash
Copy code
git push origin my-customization
Submit Another Pull Request (if needed): If your changes conflict with the updates from the original repository, you may need to submit another pull request with the resolved conflicts.