Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

How to backport changes from this template to the individual projects #6

Open
noxan opened this issue Apr 30, 2014 · 3 comments
Open

Comments

@noxan
Copy link
Member

noxan commented Apr 30, 2014

No description provided.

@noxan
Copy link
Member Author

noxan commented May 8, 2014

create a patch file inside the django-project-repository:

$ git format-patch <base version of project> --stdout > project-template.patch
$ sed -i 's/{{ project_name }}/<project_name>/g' project-template.patch
$ sed -i 's/project_name/<project_name>/g' project-template.patch

change to your project and apply the patch:

$ git am <path to django-project-template>/project-template.patch

if the patch does not apply and you want to apply it manually do your changes and then run:

$ git add <changed files>
$ git am --continue

if you do NOT want to apply the patch run:

$ git am --skip

@noxan
Copy link
Member Author

noxan commented May 8, 2014

and please take care of the commit messages especially if they do contain keywords parsed by github like referencing issues!

@noxan
Copy link
Member Author

noxan commented Jun 26, 2014

add the commit id and the project template version to the init file, might be usefull to track diffs

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

1 participant