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

The main change is the Art1BodyP3 #57

Closed
wants to merge 36 commits into from

Conversation

wgaonar
Copy link

@wgaonar wgaonar commented Apr 16, 2017

There are so many changes but the only important is related with the split of Art1BodyP3 in 2 parts

@AngelLM
Copy link
Owner

AngelLM commented Apr 17, 2017

wow, it will take me a while to see what changed! Will be merged soon ;)

@wgaonar
Copy link
Author

wgaonar commented Apr 17, 2017 via email

@AngelLM
Copy link
Owner

AngelLM commented Apr 18, 2017

Hi @wgaonar ,
Will you mind if we do this step by step? I'm not a master (yet) of git and I don't really know how to manage many commits in only one PR. If you don't mind, create a new branch synchronized with my current repo, then add the files of the splitted Art1Body part, commit and pull in that branch and after that send me the PR from that branch.
In this way you will can update the repo with the new Art1Body design without merging the rest of the files ;)

Ask if you need help with this ;)
Thank you very much!

@wgaonar
Copy link
Author

wgaonar commented Apr 18, 2017 via email

@AngelLM
Copy link
Owner

AngelLM commented Apr 18, 2017

Perfect, then I'll close this PR and will wait for the new ones ;)

I tried (in other different repo) to do this:

  1. Add a remote using: git remote add origin https://github.com/AngelLM/Thor
  2. Go to the remote dev branch: git checkout origin/developer
  3. Create a new branch based in this one: git checkout -b syncbranch
  4. Add the new files
  5. Commit them
  6. Send a pull request

Hope it helps!

@AngelLM AngelLM closed this Apr 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants