Force checkout a branch with git

Occasionally, and probably against better practice, it's necessary to force a checkout of branch. Doing so, necessarily overwrites any changes in the currently checked-out branch, but so be it.

Using git it's done like this:

git checkout -f BRANCHNAME

The "-f" part is the "force" option. Using "--force" instead does the same thing.

Why would one do this? If for no other reason, than because it may just be easier to stomp on the changes in one branch than to resolve the conflict.

Comments

Remove control of Chrome being managed by organization on personal devices

Chrome may indicate that it's being managed by a user's organization. This warning is provided by the Chrome Policies feature of the browser. To know if an instance of Chrome is managed by an organization, there will be an entry at the bottom of the browser’s hamburger menu (three dot menu), on the right side of the browser window that reads, "Managed by your organization." This is likely due to an entry in the Chrome Policies listing, which can be found by loading this page in the browser: chrome://policy The policies listed in this section are stored in the computer's file system in one of the following locations as JSON files. /usr/share/chromium/policies/managed /usr/share/chromium/policies/recommended Remove the offending JSON files, and click the Reload policies button. The Managed by your organization entry in the browser menu should be gone. A notice like this on instances of Chrome for work, school, library, or other devices that belong to an organizati...

Allow Windows authentication using SQL Server driver with DBeaver

DBeaver will allow Microsoft Windows single sign on access when connecting to Microsoft SQL Server using the SQL Server driver (rather than jTDS ). From the driver properties settings, set the integratedSecurity flag to true . Open the Connection configuration panel and choose the Driver properties section. Set the integratedSecurity flag to true . A subtle, but important step is to not provide username and password credentials to the connection.

Connecting to SQL Server with jTDS using Windows Authentication

UPDATE: At one point the tip in this article to set the USENTLV2 flag to true was accurate, but it appears it is no longer necessary, at least as far as DBeaver 's use of the driver is concerned. If it solves an authentication problem, then great. The expectation is that, an update in one of the packages that make this sort of connection possible has resolved the issue that at one time made this flag necessary. Connecting to Microsoft SQL Server using jTDS with a username and password that's managed by the database manager is pretty straightforward. It may become a little more problematic however, when trying to use Windows authentication when connecting from a Windows machine. Do not supply a username and password. Set the USENTLMV2 property to true. NOTE: Step 1 assumes a connection being made from a Windows machine. If the connection is being made from something else, user credentials may actually be necessary. If the connect...

Orsburn (Static Content)

Search This Blog