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

Improve the git workflow for the template #38

Closed
xmnlab opened this issue Jan 19, 2023 · 3 comments
Closed

Improve the git workflow for the template #38

xmnlab opened this issue Jan 19, 2023 · 3 comments
Labels
git grant-psf-2023-01 Grant Python Software Foundation, 2023 research size:small <=5h template

Comments

@xmnlab
Copy link
Member

xmnlab commented Jan 19, 2023

Currently, if there is already any commit on the origin/upstream main branch .. the branch created by the cookiecutter will have conflicts when we want to open a PR.

Additionally maybe it is too verbose to add the info for upstream and origin https urls
we probably should use a different approach

@xmnlab
Copy link
Member Author

xmnlab commented Jan 26, 2023

we need to discuss a better approach for the initial branch.

@YurelyCamacho YurelyCamacho added the grant-psf-2023-01 Grant Python Software Foundation, 2023 label Apr 20, 2023
@xmnlab xmnlab removed the gsoc-2023 label May 23, 2023
@xmnlab
Copy link
Member Author

xmnlab commented Jul 26, 2023

current, scicookie creates a new branch with no history ... and when we want to create a PR it raises issue because the history of that new branch is totally different than the main branch ..

some ideas to fix that:

  • check if the origin and upstream exists
  • if it exists, before create any commit, we should:
    • run git stash for the changes in the new branch,
    • rebase it on top of upstream/main
    • run git stash pop
    • and create a new commit
  • if upstream or origin doesn't exist, maybe we could keep the same workflow

@xmnlab
Copy link
Member Author

xmnlab commented Aug 21, 2023

done

@xmnlab xmnlab closed this as completed Aug 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
git grant-psf-2023-01 Grant Python Software Foundation, 2023 research size:small <=5h template
Projects
None yet
Development

No branches or pull requests

2 participants