make/local issue
9 views
Skip to first unread message
Bob Carpenter
Oct 23, 2014, 5:16:43 PM10/23/14
to stan...@googlegroups.com
It looks like a copy of someone's
make/local
got checked into develop which keeps causing conflicts.
What's the right action to take here? Should make/local
be removed or is there some magic to make it stop griping and
not override the one on origin?
- Bob
make/local
got checked into develop which keeps causing conflicts.
What's the right action to take here? Should make/local
be removed or is there some magic to make it stop griping and
not override the one on origin?
- Bob
Reply all
Reply to author
Forward
0 new messages