search

eCitizen / chapter

Collaborative drafting and coordination of writing for CUSP Book Chapter
1 stars 2 forks source link

New bib (new entries) #8

Closed findthomas closed 10 years ago

dazzaji commented 10 years ago

I attempted to merge the pull request... but there is an alert that appears to require a command line action. The notice on the GitHub page for this pull request reads as follows:

"We can’t automatically merge this pull request. Use the command line to resolve conflicts before continuing."

Arek/Thomas/Brian: Any idea how to resolve this? Thanks,

dazzaji commented 10 years ago

Looks like Thomas was able to add his content directly to the Master Branch file, as per Arek's recommendation.