While both these settings act on how git pull should behave when git, during a git pull, has to reconcile changes in your local branch with upstream changes, they don’t turn the same knob. pull.ff can be set to false | true | only. It matches the cli options : –no-ff | –ff | –ff-only, … Read more
The refs/pull/<number>/merge is a reference created by GitHub to keep track of what would happen if a pull request was merged. It references the merge commit between refs/pull/<number>/head and the destination branch (e.g. master). You can think of it as a “future” commit. GitHub (as well as other Git-based collaboration platforms) use this technique to … Read more
You need to update your local master branch. Do the following steps: git checkout master git pull origin master git checkout << your branch >> git merge master After you execute the 4th command, you will get merge conflicts. Resolve them and then do: git commit
I finally managed to make it work, using PuTTY’s Pageant authentication agent instead of ssh-agent, and following the steps mentioned here (it’s for Visual Studio Code, but works for Visual Studio 2017 and I guess it should work for any application that uses the “official” Git for Windows). Since I already had Pageant installed and … Read more
But how do I reuse a tag now? If I commit more code to my local repository and want it to be version 1.0 easily? Or do you just add a new tag like 1.1? You can delete the tag with git tag -d 1.0, then delete it on the server with git push origin … Read more
Answer is: Yes, it is possible to have a .gitignore file in a subfolder. Documentation: When deciding whether to ignore a path, Git normally checks gitignore patterns from multiple sources, with the following order of precedence, from highest to lowest (within one level of precedence, the last matching pattern decides the outcome): Patterns read from … Read more
default-cache-ttl max-cache-ttl This is the correct way to do this. The default timeout there is 10 minutes so if there are more then 10 minutes between your commits you would have to extend the time. C:\Users\SashaChernykh.gnupg\gpg-agent.conf This is not the correct path. This would be the path on a GNU/Linux system. The Home directory for … Read more
All the untracked files does not get impacted when you move in between different branches. As they belong to your filesystem and, GIT is unaware that to which branch these files belong. So when you commit those files, then GIT is aware of which files belong to which branch. And can remove or add files … Read more
If your git repo is self hosted, check the file system rights on the remote git directory. If this gets corrupted, it is possible that your git server just doesn’t have rights. For instance, I host my own gitosis system on Ubuntu server. When I create the git repo on the server, I run sudo … Read more
No, they shouldn’t be used together. Apple says “You shouldn’t store app folders, libraries, or .tmp files in iCloud Drive.” .git is an app folder. There is a list of filenames excluded by iCloud Drive that git doesn’t avoid. So, for example, if you name a tag “tmp”, that tag won’t be synced. There’s also … Read more