2

I'm currently attempting to use Bazaar (via Bazaar Explorer for Windows) to manage some WordPress sites.

Local and distant branches have naturally diverged: some files such as .htaccess and wp-config.php are inevitably different.

As partial bzr-merge seems to be impossible (cf. Bazaar merge questions), I'm looking for a efficient way in order to manage this two branches: reflecting changes made to a branch into the other (or vice versa) without having to re-commit diverging files each time.

Community
  • 1
  • 1
P. Mergey
  • 313
  • 4
  • 18
  • What about doing a `revert` on those files right after the merge ? – TridenT Dec 04 '14 at 09:13
  • I wonder if `pull` wouldn't be a more appropriate command (rather than `merge`). But is it possible to use `revert` after doing this? – P. Mergey Apr 12 '15 at 11:40

0 Answers0