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

Changes in draft-dejong-remotestorage-06 but not in source.txt #129

Closed
untitaker opened this issue Nov 26, 2015 · 4 comments
Closed

Changes in draft-dejong-remotestorage-06 but not in source.txt #129

untitaker opened this issue Nov 26, 2015 · 4 comments

Comments

@untitaker
Copy link
Member

@michielbdejong You accidentally pushed #127 to master.

@untitaker
Copy link
Member Author

argh nvm I get it

@untitaker
Copy link
Member Author

No, actually there's still a problem. @fkooman's commits changed draft-dejong-remotestorage-06, but not source, and you merged those broken commits untouched to master.

@untitaker untitaker reopened this Nov 26, 2015
@untitaker untitaker changed the title michiel accidentally merged frko-06-review-2-rest Changes in draft-dejong-remotestorage-06 but not in source.txt Nov 26, 2015
@michielbdejong
Copy link
Member

Difference between source.txt and the built release file fixed with 9e14a6e, right?

I also moved the built release files to a release/ folder, to make it less confusing in the future.

you merged those broken commits untouched to master.

AFAICS, no commits were accidentally merged from #127 but please open an issue if there were any, so we can fix that for the 07 spec. I just checked the top one, da00a4a, and that one is unmerged (instead I opened #135 about that).

@untitaker
Copy link
Member Author

LGTM

On 1 December 2015 09:02:06 CET, Michiel de Jong [email protected] wrote:

Difference between source.txt and the built release file fixed with
9e14a6e,
right?

I also moved the built release files to a release/ folder, to make it
less confusing in the future.

you merged those broken commits untouched to master.

AFAICS, no commits were accidentally merged from
#127 but please open an issue
if there were any, so we can fix that for the 07 spec. I just checked
the top one, da00a4a, and that one is unmerged (instead I opened #135
about that).


Reply to this email directly or view it on GitHub:
#129 (comment)

Sent from my phone. Please excuse my brevity.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

No branches or pull requests

2 participants