search

AB-CE / abcFinance

Agent-based computational Finance
Apache License 2.0
37 stars 13 forks source link

refactor examples IFRS and banking_agent #25

Closed siebenbrunner closed 6 years ago

rht commented 6 years ago

@siebenbrunner you can rerun the travis test by doing these:

  1. git commit --amend --no-edit (basically changes the timestamp of the commit)
  2. git push -f for update origin/master with this commit with a new timestamp.
rht commented 6 years ago

Also, git merge is messy, before you did the rerunning the travis test, you can clean up the branch by doing these:

  1. git rebase -i HEAD~5 -- then replace 'pick' to 'drop' to all the commits that do merge branch and fix merge commit
  2. git pull --rebase upstream master -- this pulls the change from upstream/master and then reapplies the new commits i.e. "some fixes to get the old examples running again (not working)" and "get examples running again"
  3. git push -f
rht commented 6 years ago

Actually, I have done these git plumbing things in #27 so you don't have to do them.

DavoudTaghawiNejad commented 6 years ago

Superseeded by pr #27 which is merged in.