Leftover files being changed in build ... you may need to do a git checkout of 2 files

2 views
Skip to first unread message

Timothy Lethbridge

unread,
Sep 18, 2018, 10:05:41 AM9/18/18
to Umple Development Discussions
Hi,

As a result of yesterday's pull request merge, the following files were
being modified in every build:

modified:
cruise.umple/test/cruise/umple/implementation/nusmvoptimizer/FlatElevator.smv
modified:
cruise.umple/test/cruise/umple/implementation/nusmvoptimizer/FlatSpecificFlight.smv

I just merged a pull request that deletes these and also insures they are
cleaned up after every build.

However, you may find that your git update fails due to a conflict. You
will likely need to do a 'git checkout' for the files before a merge will
work.

Tim


Timothy C. Lethbridge, PhD, P.Eng., I.S.P., CSDP
Professor of Software Engineering and Computer Science
/ Professeur Titulaire de génie logiciel et d'informatique
Faculté de genie / Faculty of Engineering
University of Ottawa / Université d'Ottawa
Tel: 613-562-5800x6685 Fax: 613-562-5664 Mobile: 613-252-1850
http://www.eecs.uottawa.ca/~tcl

Opeyemi Adesina

unread,
Sep 18, 2018, 10:11:52 AM9/18/18
to umpl...@googlegroups.com
Okay, thanks!

--
You received this message because you are subscribed to the Google Groups "Umple-Dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to umple-dev+...@googlegroups.com.
To post to this group, send an email to umpl...@googlegroups.com.
Visit this group at https://groups.google.com/group/umple-dev.
For more options, visit https://groups.google.com/d/optout.
--
Opeyemi Adesina, PhD. | Instructional Support Coordinator
School of Computer Science, University of Guelph
Reynolds Building - Room 1112
474 Gordon Street, Guelph, ON N1G 1Y4
Reply all
Reply to author
Forward
0 new messages