I have a requirement to automate the merge through azure pipeline upon deployment is complete. For example : I have a branch - 'release/1.0.0' which is used for the deployment, post deployment this branch needs to be auto merged into…
In Visual Studio, I can easily take the current (or incoming) branch's changes while resolving merge conflicts. This is like merging with --ours (or --theirs) merge strategy for a single file. Could someone please tell me how I would do…
For the past few days, I've been trying to push a branch to a private repo from VS Code with the GitLens extension, only to have it fail with the following cryptic message: [2022-12-02 21:00:41.637] Failed to execute git {…
I am making my first commit using GIT in VS Code. I only have one main branch in Github and while I was using git push, I send it as: git push origin/master accidentally. Error: error: src refspec main does…
I know similar questions have been asked many times, but there's a difference here: Trying to clone project from cpanel shared hosing server: If tried with this command sudo git clone ssh://[email protected]:21098/home/mlbrpkxs/unified.mlbranch.com it show the following error. Cloning into 'unified.mlbranch.com'...…
So I need a LFS supported git home server for a game project. However I've run into multiple issues trying to do this and googling for hours without a satisfying answer on what is happening. I'll start by introducing my…
I did see some things going around about this but answers point to update of visual studio 2017 or 2019. I just updated my VS 2022 issue persists. I have been coding for a solid 2 months within my master…
I want to add a feature to https://github.com/opentripplanner/otp-react-redux/ which is pulled in from the https://github.com/opentripplanner/otp-ui/tree/master/packages/geocoder package (add another geocoder). Coming from the PHP world and composer, I normally do in such cases composer install rm -r vendor/foo/bar composer install --prefer-source…
i have added a second 2 ssh keys and added the needed config in ubuntu WSL2 ~/.ssh Host github-key2 HostName github.com PreferredAuthentications publickey IdentityFile ~/.ssh/key2 so in UBUNTU this works: git clone git@github-key2:vendor/repoxxx.git But i need to geht this running…
I have a few repos on GitHub. Up until now, I've used a single machine (a Mac) to host the local version of of these repos; i.e. they are located in the folder /Users/seamus/Documents/GitHub on the Macintosh HD for this…