Prevent local branch overwrite - Git pull origin

  1. Reset your local master to match the remote repository's master (WARNING: be sure that you don't have any uncommitted changes you want to keep before issuing the following command):
    git reset --hard origin/master
  2. Fetch all remote branches into your local repository:
    git fetch origin
  3. Create a new local vsup12 branch from the remote vsup12 branch, and switch to this new local branch:
    git checkout -b vsup12 origin/vsup12
Source

Comments

Post a Comment

Popular posts from this blog

Generate ArcGIS Token By URL Request From ArcGIS Portal, Federated Environment , ESRI JS API and Angular snippets

In my custom angular web application, I had to pull the data from different ArcGIS server environments, say Dev ArcGIS server and Test ArcGIS server environment, some of my items are directly referred from ArcGIS server services and some of them are from Enterprise portal referring the WebMapId and PortalId from both environment (Dev, Test). Servers are in federated environment. To pull the data from different ArcGIS server environment, user must login in each environment. In addition, user must login to get inside the custom application and Enterprise AD Group was set to authenticate users on the custom web application and ArcGIS server environments. So, there will be 3 login attempts (1 –application itself, 2- Dev server/portal, 3- Test server/portal) to use the application, which doesn’t provide good user experience. To improve the better application workflow, I decided to reduce the number of logins required in the application and use AD Username and Password captured du...
Read more

Update WPF Interaction Triggers in from .Net Framework 4.8 to .Net 5

  When migrating the Visual Studio projects from .Net Framework 4.8 to .Net 5, you may encounter   in the following error regarding Interaction.Triggers .   Error      XDG0008             The name "Interaction" does not exist in the namespace "http://schemas.microsoft.com/xaml/behaviors".   The one solution to fix it is to install “ Microsoft.Xaml.Behaviors.Wpf ” from Nuget And update the namespace ( if needed) xmlns : i ="http://schemas.microsoft.com/expression/2010/interactivity" to              xmlns:i ="http://schemas.microsoft.com/xaml/behaviors"
Read more

Solution: IntelliJ not recognizing a particular file correctly, instead its stuck as a text file

Image
I had mistakenly save my class as fileName.text file and tried to rename it with fileName .java but the IntelliJ couldn't recognize it and throws the error saying.. After spending long hours on internet, I found a solution and sharing/keeping here for future reference. Step 1: Click "File"==> "Settings" Step 2: Expand "Editor" & Click "File Types" Step 3: You will see all file types on Right. Navigate to the "Text Files" and Click it Step 4: You should able to see your file name on the bottom of Registered Patterns (lower box) Step 5: Remove your file from the Registered Patterns. The problem should solved and let you to rename with fileName.java Step 6: If not, delete the file from the project and create it again with name fileName
Read more