Newbe Dev Stack

Answer : Meld (alternative link) Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial. Look at the screenshots page for more detailed features. I like diffuse: Diffuse is a graphical tool for merging and comparing text files. Diffuse is able to compare an arbitrary number of files side-by-side and gives users the ability to manually adjust line-matching and directly edit files. Diffuse can also retrieve revisions of files from Bazaar, CVS, Darcs, Git, Mercurial, Monotone, Subversion, and SVK repositories for comparison and merging. gvimdiff is handy for quick comparisons. Install gvim to get it.

Answer : In Gitlab, the merged status means the relevant commits have been merged and no action is needed. A closed merge request is one that has been put aside or considered irrelevant. It is therefore not merged into the code base. Therefore, you only merge MRs when you're happy with the changes and close them if you think the changes are not worthy of being integrated into the code base ever. A typical workflow would be the following: User A works on a new feature in a feature branch and pushes their work to that branch. They can open a merge request to merge their feature branch into master. User B pulls the feature branch, eventually rebasing it onto master, and runs the tests they want. If User B is happy with the changes/new feature, they can merge the MR into master (or whatever branch you merge into) The merge request will be shown as merged Of course it's better if the tests run automatically in a CI. With GitLab 12.2 (August 2019), you have n...

Answer : Have a look at at File comparison tools, from which I am using WinMerge. It has an ability to compare XML documents (you may wish to enable DisplayXMLFiles prefilter). DisplayXMLFiles.dll - This plugin pretty-prints XML files nicely by inserting tabs and line breaks. This is useful for XML files that do not have line returns in convenient locations. See also my feature comparison table. I wrote and released a Windows application that specifically solves the problem of comparing and merging XML files. Project: Merge can perform two and three way comparisons and merges of any XML file (where two of the files are considered to be independent revisions of a common base file). You can instruct it to identify elements within the input files by attribute values, or the content of child elements, among other things. It is fully controllable via the command line and can also generate text reports containing the differences between the files. There are a few Java-bas...