Skip to content

merging mg-scripts #105

New issue

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

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

Already on GitHub? # to your account

Closed

Conversation

antgonza
Copy link
Member

@antgonza antgonza commented Apr 7, 2025

This PR doesn't have any new code, the steps to create it were:

  1. Make sure that the [local-folder] of mg-scripts was up to date with master.
  2. Move to local and up to date version of qp-knight-lab-processing main branch.
  3. Create a new branch: git checkout -b 'merging_mg-scripts'
  4. Add a local "remote": git remote add mg-scripts [local-folder]/mg-scripts/
  5. git fetch mg-scripts --tags
  6. git merge --allow-unrelated-histories mg-scripts/master
  7. Fix conflicts
  8. git remote remove mg-scripts
  9. git add .
  10. git commit -m 'merging mg-scripts'
  11. git push origin merging_mg-scripts

Following the steps here.

@antgonza antgonza mentioned this pull request Apr 7, 2025
@antgonza
Copy link
Member Author

Superseded by #107

@antgonza antgonza closed this Apr 22, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant