search

ObsidianBox / Obsidian

Obsidian is the implementation of Magma that extends Forge to deliver server-side content on demand.
http://obsidianbox.org
MIT License
12 stars 3 forks source link

Don't get a Field object for each plugin load #28

Closed olliestanley closed 10 years ago

Lunaphied commented 10 years ago

Was this merged? On Aug 14, 2014 7:40 AM, "Ollie" notifications@github.com wrote:

Closed #28 https://github.com/ObsidianBox/Obsidian/pull/28.

— Reply to this email directly or view it on GitHub https://github.com/ObsidianBox/Obsidian/pull/28#event-152832243.

olliestanley commented 10 years ago

nope - it was broken - see #29

Lunaphied commented 10 years ago

You know you can just update a PR right? Also are you on IRC? On Aug 14, 2014 7:54 AM, "Ollie" notifications@github.com wrote:

nope - it was broken - see #29 https://github.com/ObsidianBox/Obsidian/pull/29

— Reply to this email directly or view it on GitHub https://github.com/ObsidianBox/Obsidian/pull/28#issuecomment-52179136.

olliestanley commented 10 years ago

Yes I know I can update a PR, but as the guidelines require one commit per PR it was easier to do a new one instead of messing around with squashing etc - and yes I'm on IRC (DziNeIT)

Wolf480pl commented 10 years ago

commit --amend

olliestanley commented 10 years ago

don't you then have to force push or something?

Wolf480pl commented 10 years ago

yeah, but force-pushing is fairly straightforward too.

olliestanley commented 10 years ago

yeah it's not hard, but in general i don't like force push. i guess it doesn't really apply to my own fork because nobody else is working on the fork at the same time but in general it can causes problems

Lunaphied commented 10 years ago

I only use force push to update my Fork's to the latest upstream master before I start working on a feature.

olliestanley commented 10 years ago

yeah but both squash and --amend require a force push