raboof@clacke yeah - it's still a huge pain in the butt though, especially with (re)moved files or when a merge contains fixes that are not directly visible to git as merge conflicts.
I guess you could say "don't do that then", but... too late for that ;)
GNU social JP is a social network, courtesy of GNU social JP管理人. It runs on GNU social, version 2.0.2-dev, available under the GNU Affero General Public License.
All GNU social JP content and data are available under the Creative Commons Attribution 3.0 license.