universe: git command to prepare and store patch revisions as git tags. Unresolved = !$HG files -T "\0" "set:unresolved()" | xargs -0 code -wait Code language: PHP ( php )Īfter that running hg unresolved will open any unresolved files in VS Code. All the data is now in your individual repositories and you can merge the changes and work with them without needing any connection to the served repository. GTK+ frontend for the git directory tracker - personal details plugin. If they get tagged, they become frozen until they are tagged by another player. It registers VS Code as the merge tool for conflicts and also adds a hg vsd command to open side by side diffs of individual files in VS Code.Īnd if you do still need to open any unresolved files in VS Code you can use this config: Every other player tries to avoid being tagged. Opts.vsd = -wait -diff Code language: PHP ( php ) Add the following to your ~/.hgrc: Ĭode.args = -wait -merge $other $local $base $output Well it turns out that since version 1.69 VS Code now has built in support for acting as a merge tool and after trying it out I actually found it to be useful! Given that they (and the rest of the world) tend to focus on Git I couldn’t find explicit instructions for setting it up for Mercurial so here is how you do it. I’ve always struggled to find a graphical merge tool that I can actually understand and up until now I have just been using merge markers along with a handy Mercurial command to open all conflicted files in VS Code, my editor of preference.
0 kommentar(er)
