@wenzeslaus as discussed yesterday, here the list of PRs with merge conflicts which require the command line procedure:
It would be great if you could apply your "conflict cleanup" procedure to these PRs. Thanks!
@neteler I did, but was looking at the wrong place. I propose that while I'm working on the prompt itself, I'll also update it to show the full path to the project in use, or do we want to just show the last 2 directories of the full project path (corresponding to location/mapset)?
Also I think that a 2-line prompt will make it easier to read and less prone to confusing the project with CWD for the user, especially people not really used to the CLI. There will be resistance from some users (some people feel very attached to their prompt for some reason), but I feel that a 2-line prompt will make it easier for new users to see what's going on and old users will eventually get used to the prompt. I'd love to hear your thoughts on the matter, esp as you originated the whole thing :)