FAQ: update example for a local tracking branch setup
authorAchim Gratz <Stromeko@Stromeko.DE>
Tue, 27 Nov 2012 20:58:32 +0000 (21:58 +0100)
committerAchim Gratz <Stromeko@Stromeko.DE>
Tue, 27 Nov 2012 20:58:32 +0000 (21:58 +0100)
commit771e43ecd3f7362107f74af2d0e77e86f537bfe8
treed6c0c4ba57f974b13ae54087a661217c5df92a7e
parent5c364144dea8c375d11359d45d929dc2510780c4
FAQ: update example for a local tracking branch setup

* org-faq.org: Update example to not refer to the Makefile anymore.
  Expand on conflict resolution and remove a largely duplicated
  section.
org-faq.org