search

faitdivers / pyao

PyAO - Adaptive Optics simulation package
6 stars 0 forks source link

Kolmogorov & Von Karman added + updates in the main #76

Closed larsvl closed 10 years ago

larsvl commented 10 years ago

New format of parameter passing in wfg(..), required changes to the main. It is now possible to add kolmogorov von karman and zernike modes.

faitdivers commented 10 years ago

@larsvl unfortunately we cannot merge this branch automatically.

What you have to do is the following: First, pull the master branch from the remote server into you local master branch via: git pull origin master

Then ensure that you are in the branch WFG-for-Main: `git checkout WFG-for-Main``

Afterwards merge the most recent master version into your WFG-for-Main branch: git merge master

Conflicts will ensue, and you will have to opt for parts of your code and parts from the code that was previously in the master.

larsvl commented 10 years ago

Indeed, your right we can't pull automatically, I should have noticed that yesterday. Unfortunately I work with the Github GUI interface, so I'll have to find the right buttons instead of the command lines. So what you are saying, merge the master into the WFG branch and then merge WFG + the additions into the master?

----- Reply message ----- From: "João Lopes e Silva" notifications@github.com To: "faitdivers/pyao" pyao@noreply.github.com Cc: "larsvl" larsvl@live.nl Subject: [pyao] Kolmogorov & Von Karman added + updates in the main (#76) Date: Tue, Jun 10, 2014 21:32

@larsvl unfortunately we cannot merge this branch automatically.

What you have to do is the following: First, pull the master branch from the remote server into you local master branch via: git pull origin master

Then ensure that you are in the branch WFG-for-Main: `git checkout WFG-for-Main``

Afterwards merge the most recent master version into your WFG-for-Main branch: git merge master

Conflicts will ensue, and you will have to opt for parts of your code and parts from the code that was previously in the master.

Reply to this email directly or view it on GitHub: https://github.com/faitdivers/pyao/pull/76#issuecomment-45660556

faitdivers commented 10 years ago

So, first you need to update your local master with the most recent master version that is stored in the server. Then you need to merge your local master into your WFG branch.

When you have successfully done that and eliminated all the conflicts the button that says 'Merge pull request' should turn green. From then on it is the reviewer's responsibility to merge the code.

larsvl commented 10 years ago

I have created a new pull request #77, consider this one as discarded, as it was giving to many errors with a very clear origin.