Baseless Merging of different branches of your srouce code

The process of merging items that are not directly branched from each other is called a baseless merge. For example:

you might want to merge a change between two release branches (Iteration 1 and Iteration 2), which are siblings of each other, without merging up to the parent branch (Main). You can only perform a baseless merge by using the Tf mergecommand. In Visual Studio 2010 and prior, you cannot perform a baseless merge from within the Visual Studio IDE. But in Visual Studio 2012, this feature (Baseless merge) is integrated with VS IDE merge wizard. We will see this merge wizard in the last.

 Just perform following 4 steps and merge your baseless branches.
  • Step 1 – Evaluate Whether a Baseless Merge Is Needed
  • Step 2 – Perform a Baseless Merge Using Tf.exe
  • Step 3 – Resolve Merge Conflicts
  • Step 4 – Check-In the Merged Changes

    • Before performing the merging, get latest code of both branches. Now open a Visual Studio command window, and run the following Tf.exe command from the command line:

     
    Tf merge /baseless <<source path>> <<target path>> /recursive

    Example
    Tf merge /baseless e:\data\proj1 e:\data proj2 /recursive
    

    
If you need to merge specific versions of the code changes, you can use the version switch with Tf.exe as follows:
    

    tf merge /baseless <<source path>> <<target path>> / recursive /version:<<from Changeset>>~<<to Changeset>>
    

    

    
Example
    

    tf merge /baseless e:\data\proj1 e:\data\proj2 /recursive /version:C123~C125
    

    

    

    After executing the Tf command, you need to resolve conflicts that might occur when performing a baseless merge. After you run the Tf.exe command, it displays a Resolve Conflicts dialog box with a list of the files that have conflicts. After resolving the conflicts, you are now able to check in the changes and get the merged release.
    

    

    

    Visual Studio 2012 Baseless Merge Wizard 
    

    

    

    Right-click on the branch Iteration2 and select Merge option in Branching and Merging popup menu. Following popup window would be displayed.
    

    

    

    

    

    

    

    

    

    The Browse button at Target branch is new feature in Visual Studio 2012. Click on the Browse button and select and Target branch with which you want to merge the Iteration 2.
    

    

    

    

    

    

    

    

    

    

    

    Click Next and merge will be done as normal merging. Resolve the conflicts (if any) in the pending changes and check in the code.
    

    

    

    

    

    

    

    

    

    

    

    

    















    

    

    

    


    

    

    

    


    Comments
    

    





    

    

    


    Post a Comment
    





    

    

    

    

    




    

    

    

    

    

    
Popular posts from this blog

    

    

    

    

    Data Bound Controls in ASP.Net - Part 4 (FormView and DetailsView controls) 
    

    

    







    

    

    

    

    
  FormView   The FormView control is used to display a single record from a data source. It is similar to the DetailsView control, except it displays user-defined templates instead of row fields. Creating your own templates gives you greater flexibility in controlling how the data is displayed. The FormView control supports the following features:   ·          Binding to data source controls, such as SqlDataSource and ObjectDataSource.   ·          Built-in inserting, updating and deleting capabilities.   ·          Built-in paging capabilities.   ·          Programmatic access to the FormView object model to dynamically set properties, handle events, and so on.   ·          Customizable appearance through user-defined templates, themes, and styles.     Templates   For the FormView control ...

    


    

    

Read more


    

    

    

    

    JavaScript - ES2015 (aka ES6)
    

    

    







    

    

    

    

    
  The ES2015    Since this long time passed between ES5.1 and ES6, the release is full of important new features and major changes in suggested best practices in developing JavaScript programs. To understand how fundamental ES2015 is, just keep in mind that with this version, the specification document went from 250 pages to ~600.   In this blog, we describe the most important changes.   Arrow Functions  A new  this   scope  Promises  Generators  let   and  const  Classes  Constructor  Super  Getters and setters    Modules  Importing modules  Exporting modules    Template Literals  Default parameters  The spread operator  Destructuring assignments  Enhanced Object Literals  Simpler syntax to include variables  Prototype  super()  Dynamic properties    For-of loop  Map and Set  New String methods  New Object methods      Arrow functions   Arrow functions since their introduction changed how most JavaScript code looks (and works).   Visually, it’s a simple and welcome ...

    


    

    

Read more


    

    

    

    

    The Clickjacking attack and X-Frame-Options
    

    

    







    

    

    

    

    
   Clickjacking      Clickjacking is a type of “web framing” or “UI redressing” attack. What that simply means in practice is that:       1. A user (victim) is shown an innocuous, but enticing web page (think watch online video)   2. Another web page (that generally does something important – think add friends on social network) is layered on top of the first page and set to be transparent   3. When the user thinks they are clicking on the web page they see (video), they are actually clicking on the higher layered (framed) page that is transparent        There are two main ways to prevent clickjacking:   1.     Sending the proper X-Frame-Options HTTP response headers that instruct the browser to not allow framing from other domains   2.     Employing defensive code in the UI to ensure that the current frame is the most top level window     Using X-Frame-Options   X-Frame-Options  originally invented by Microsoft for IE8, but supported by a number ...

    


    

    

Read more