search

thaliproject / postcardapp

A sample app to demonstrate how to build Thali applications
MIT License
22 stars 5 forks source link

Merge Story 0 into master #63

Closed deadlyfingers closed 8 years ago

deadlyfingers commented 8 years ago

Update master with postcard app (story_0 branch)

Review on Reviewable

yaronyg commented 8 years ago

@deadlyfingers - There is a merge conflict. You need to resolve that first.

yaronyg commented 8 years ago

10/27 - Needs to resolve merge conflicts (it's a theme!)

yaronyg commented 8 years ago

10/28 - No work on this today because of the website work. BTW this is for #233

deadlyfingers commented 8 years ago

Using P4Merge for resolving conflicts but sometimes it joins left+right as one entity so you can't choose left or right separately... Any other merge tool suggestions?