git-ignore | easily list and fetch .gitignore templates | Generator Utils library

I have a Git repository containing a Java library with two branches: main and jdk8.

The jdk8 branch is the main development branch, with all changes merged into main, whereas the main branch is modular and based on jdk11, with module-info.java files and changes in Gradle build files, different build plugins and modular versions of dependencies, where available. The source code itself is close to identical between the two branches.

What I'd like to do, is to stop developing on the jdk8 branch and start using main as the main development branch, merging changes into the jdk8 branch, from there on.

Some googling led me to these:

How to make empty merge commit (ignoring changes)?

Git - Ignore files during merge

And from that I came up with this strategy:

git checkout jdk8

git merge -s ours main

I have tested this and it looks like it works as expected, that is, allows me to start developing on main and merge the changes into the jdk8 branch, excluding any modified files that don't belong there during merge (perhaps I can use git attributes to exclude the module-info.java files automatically, for example).

On the face of it, this appears quite manageable, but since my understanding of Git is quite rudimentary, I'm wondering if this will cause some problems down the road, is there perhaps a better ("correct" even?) way of doing this?

I had a local folder that got pushed to git mistakenly at one point. I fixed it(git-ignored it, deleted it from remote, git pulled, etc.) to get them back in sync.

However, oh-my-zsh (with powerlevel10k theme) will not change the prompt's git banner back to green.

I have tried restarting iterm, reloading zshrc, removing git plugin and adding it back to zshrc, but none of this works.

Screenshot shows git status is clean, but the prompt still shows git status as yellow instead of green.

So I accidentally deleted some files using git clean --, when trying to remove them from working directory after creating git-ignore file.

I remember that I had staged them at one point, so I ran git fsck --dangling, and now have a list of blobs, tree and commits. If I look at the blobs, I only see the content, but not which file the content is from.

I had accidentally deleted some data files (8-3-21.csv, 8-4-21.csv etc). Lot of these data files are similar just with minor changes, so I cannot tell just by the content.

So I want to see if these dangling blobs are associated with the data files I deleted accidentally (2 files).

I want to use the pipeline functionality of dvc in a git repository. The data is managed otherwise and should not be versioned by dvc. The only functionality which is needed is that dvc reproduces the needed steps of the pipeline when dvc repro is called. Checking out the repository on a new system should lead to an 'empty' repository, where none of the pipeline steps are stored.

Thus, - if I understand correctly - there is no need to track the dvc.lock file in the repository. However, adding dvc.lock to the .gitginore file leads to an error message:

I am trying to ignore all files and subdirectories from the directory .config that is located at the root of the repository except the file .config/vimb/config and the subdirectory .config/ranger/.

This is my .gitconfig:

For the life of me I can't seem to 'remove' an untracked sub-module/directory from the main git repository. I've tried various syntaxes, but I keep getting the 'pathspec' error stating there was no match, even though the folder is there in plain site. I added it to the .gitignore and it has not been added or committed to the main repository at all yet, but it keeps showing up in red under Untracked files: when I run git status and I can't get rid of it. git clean -n shows nothing either.

Any clues as to what I'm doing wrong here?

To be clear: I don't want to delete the sub-repo, I merely want to track the sub-repo entirely separately and have the main-repo totally ignore it as if it does not exist.

We have a file that contains some useful debug configurations for our software. We want this file to sync onto every developer's machine. But a developer may modify that file, and we really don't want the effects of a particular debug session to be checked in. Similar questions arise for default .ini files that are synched with git but we want to be able to modify during development but not check in.

We thought we could commit the file once and then add it to .gitignore file, but that does not work -- the file still shows up as changed in git status. We also found these commands:

There are similar questions to this, but I'm pretty new to Git (long-serving TFS user) and am struggling with this. I am nervous about applying the ideas suggested by others without a full understanding of what's actually going on...

After branching/merging successfully for a few months, today the following two merge conflicts are shown when I try to merge a working branch into the main one when creating a pull request:

I am planning on migrating on-prem stored projects into the Azure DevOps to enable seamless CI/DI experience. The Azure key vault will be used to secure the secrets stored in app config files of .Net applications. Therefore, the config files of solutions will NOT contain any sensitive information in them.. all the variables in json and xml configuration files are replaced in the pipelines/release in azure devops..

But now comes the question - if all secrets are obfulscated in the code repository from all places - then how do you build and test solutions locally in the Visual Studio?

I have came up with several theoretical solutions;

1. Store the whole appsettings.Development.json files (or specific secrets from these files) in Azure Key Vault. Then make the VSIX VS extension, that would be able to connect to the vault and retrieve the settings file (or secret values) for specific solution after the code checkout.

The downside of this approach is that .Net framework (unlike .net core) web applications are using the Web.Config files, so I am not able to use the separate web.development.config file for the debugging. XML transformation is not applied during the build as far as I remember.. p.s. I am planning on adding all appsettings.X.json, Web.X.config to git-ignore.

1. Create an MsBuild post-build task, that would connect to the vault and replace the variables (in the bin folder) before application is started.

The downside is that it is not easy to distribute the MbBuild task among other developers in a team (unlike vsix extension).. HOWEVER - it will allow only mess with values in bin folder, leaving the code-versioned config files unaffected. This task must be skipped in the azure devops, naturally.

Are there any common secure approaches for sharing the development configuration files among developers without exposing them to the cloud? At this point I feel like second option is the way to go so I would like to hear any advises from the experts.