| How to convert existing phoenix app to an umbrella app. | |
| https://elixir-lang.slack.com/archives/phoenix/p1472921051000134 | |
| chrismccord [10:14 PM] | |
| @alanpeabody yes, it's straightforward | |
| [10:14] | |
| 1) mix new my_umbrella --umbrella |
| # The entries in this file are checked regularly for validity via the Github Action | |
| # sited at github.com/bskinn/intersphinx-gist. | |
| # Please feel free to post an issue at that repo if any of these mappings don't work for you, | |
| # or if you're having trouble constructing a mapping for a project not listed here. | |
| Python 3 [latest]: ('https://docs.python.org/3/', None) | |
| Python 3 [3.x]: ('https://docs.python.org/3.9/', None) | |
| attrs [stable]: ('https://www.attrs.org/en/stable/', None) | |
| Django [dev]: ('https://docs.djangoproject.com/en/dev/', 'https://docs.djangoproject.com/en/dev/_objects/') | |
| Flask [2.2.x]: ('https://flask.palletsprojects.com/en/2.2.x/', None) |
##git mergetool
In the middle file (future merged file), you can navigate between conflicts with ]c and [c.
Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).
:diffupdate (to remove leftover spacing issues)
:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)