Category "git"

Git how to merge without a merge commit, but preserving hashes (to have a straight graph line in the git log)

So I have 2 branches - develop_1 and develop_2. The first one needs to be merged into the second (let's say there are 3 commits in develop_1 which needs to be i

How do you create a gitignore file in pycharm? (windows)

What i could find relating to git settings on pycharm

"Permission denied" error from Visual Studio Code and Visual Studio (but not Git Bash)

With a new work laptop running Windows 10, I have installed git, Visual Studio Code and Visual Studio 2019. After making some test changes to code in from my pe

Git merge conflict with my previous commit when pushing my actual commit

I'm working on a project where I'm the only person committing. There is only one branch local and remote (master). My local project is up to date (pulled all ch

Visual Studio Code and git : Permission denied to X

I have 2 github account X (professional one) and Y (personal one). On my personal computed, I used both account, with Visual Code. But now, when I try to push

How to merge a development branch into the master and ignore the changes in the master?

following situation: I made some changes in the development branch ( commit f + g ). Unfortunately, there were some changes in the master branch (commit e + d),

Warning: Multiple merge bases detected. The list of commits displayed might be incomplete

In Azure Repos, I have created a PR from branch A to branch B. There are no merge conflict displayed. But I end up with the warning message Warning: Multiple m

Multiple Git push in one command

I've an application that requires to run git add/commit/push on each single file i'd like to push, in order to trigger a Gitlab Job on each. My problem is that

Windows. How set GIT_TERMINAL_PROMPT=1

Now I have GIT_TERMINAL_PROMPT=0 . And if I do git clone https://github.com/some/non-existing-repo - will fail without prompting for username & password. I

How to update a Github cloned repository?

I have created a repository on Github, and the cloned from my local machine and also push some code. I cloned that repository from a virtual online machine with

What's different between `--abort` and `--quit` as sequencer subcommands for `cherry-pick`?

As per the doc, among the three sequencer subcommands for cherry-pick, we have these two which are, to me, oddly similar : --quit Forget about the current

Access GitLab repo with project access token

According to the documentation, it should be possible to access GitLab repos with project access tokens: The username is set to project_{project_id}_bot, such

GitPython - script error - already exists and is not an empty directory

I have a script that makes a clone of the repository I need. This script must be executed every day, i.e. reload data from the repository. There are no problems

Recursively clone submodules from GitHub using an access token

I have an umbrella repo containing a number of submodules. I am using git clone --recurse-submodules --remote-submodules https://<access_token>@github.com

Single Push Without Github Action

I have a github repository for which I have an CI script set up using Github Actions. On 95% of the pushes into main, we need to run the script, so the script i

Single Push Without Github Action

I have a github repository for which I have an CI script set up using Github Actions. On 95% of the pushes into main, we need to run the script, so the script i

Why does Gitlab CI fail to get git submodule but on subsequent push checks out the submodule?

My project consists of a parent project and a child project. The child project is included in the parent project as a submodule. I am using Gitlab CI. Below is

Jupyter notebook & 'git' is not recognized as an internal or external command, operable program or batch file

I am trying the following code in a jupyter notebook if not os.path.exists(os.path.join(paths['APIMODEL_PATH'], 'research', 'object_detection')): !git clone

Cannot install with npm package from git

I am trying to install package from git, which I forked earlier. I try npm i catsaredoomed/invest-openapi-js-sdk --save-dev I've got npm ERR! prepareGitDep 2&g

Sonarlint and Intelij: possible to run analysis only for files in a changelist?

I am currently running sonarlint plugin locally in Intelij which works well. I would like to run the plugin only for files that I have in my Changelist - before