search

tg12 / FAIG

Fully Automated IG Trading
150 stars 59 forks source link

Limit per-epic trades and handle dealing rules #14

Closed FlickeringIRoam closed 6 years ago

FlickeringIRoam commented 6 years ago

1 (for now) trade per-epic, and preliminary attempt at following per-epic deal handling rules

tg12 commented 6 years ago

Hey! Thanks for this, If I want to completely reload from your branch do I do a "rebase and merge"?

FlickeringIRoam commented 6 years ago

uhhhh...i don't think there's anything to rebase TO is there? Normally a rebase sets a particular branch as the new master, but i don't believe there are any branches here, since all pull requests are directly onto tg12/FAIG-master. As long as there's no conflicts, a simple merge should be sufficient, and if you want to undo previous changes from my fork to the pull, you can do a git reset --hard to a particular commit, and then merge any pulls from there.

On Tue, Feb 27, 2018 at 6:22 PM, tg12 notifications@github.com wrote:

Hey! Thanks for this, If I want to completely reload from your branch do I do a "rebase and merge"?

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/tg12/FAIG/pull/14#issuecomment-368976040, or mute the thread https://github.com/notifications/unsubscribe-auth/AbZaZcOqVrWhJdz0Xva3MsXg2TVJP7Guks5tZEfGgaJpZM4SVaHi .

tg12 commented 6 years ago

Done that, Thank you! I read up more on how Github works.