Phil Beauvoir

Boiling this down, it amounts to doing these Archi code Actions: Current Branch - `PushModelAction` Switch Branch - `SwitchBranchAction` Other Branch - `PushModelAction` Switch Branch - `SwitchBranchAction` Current Branch -...

I'll add an experimental POC second action, something like "Merge Branch (exp)" (which won't have the explanatory dialog for now) to see if it's possible to sequence the existing actions...

I've pushed a new branch - "online-merge". This is experimental work. I've added a new context menu item to Branches View - "Experimental Merge", It does a sequence of actions...

I've done some testing and it seems to work, but we need to really try different scenarios. If the sequence works, I can then improve the UI with a unified...

There's a problem with the way that JGit merges after resolving a merge conflict. Here's an image taken after merging in Archi:  The "origin/master" branch is not on the...

Look at the second image above. That's how it should look after a merge conflict. "origin/master" is behind "master" in the timeline. However, the first image shows that "origin/master" is...

Here is the sequence of actions performed in the "Experimental Merge" menu action: #### Init 1. Ask to save model, if needed 2. Export to Grafico 3. Offer to commit...

Do you mean an information dialog like "Commit was successful" or something like that?

No news. It hasn't been implemented (yet). I've been too busy with other Archi features.

In fact this is not just limited to branches, but any commit that does not contain Archi grafico XML files.