Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Adding folders_to_ignore property #337

Merged
merged 4 commits into from
Jan 16, 2015

Conversation

miguelrgonzalez
Copy link
Contributor

Folders_to_ignore now at dev branch

@grtjn
Copy link
Contributor

grtjn commented Jan 15, 2015

Hmm, pity. Can't automatically merge. I think it is because your dev branch wasn't holding the latest from marklogic/roxy dev branch. Can you try:

$ git fetch upstream
$ git rebase upstream/develop

And then git push to append to your pull-request?

@miguelrgonzalez
Copy link
Contributor Author

Hi Geert,
I had quite a mess on my local git. I forgot to update my local dev
branch with the latest and was using a really old commit as a base....

anyway, I think it's fixed now.

Cheers,
Miguel

@grtjn
Copy link
Contributor

grtjn commented Jan 16, 2015

Yes, result looks good. @paxtonhare or @dmcassel care to click the Merge button?

dmcassel added a commit that referenced this pull request Jan 16, 2015
Adding folders_to_ignore property
@dmcassel dmcassel merged commit c1166fc into marklogic-community:dev Jan 16, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants