If you have it in ignore, use git clean -xf. You can do git clean -xdf but that will also remove untracked directories. Use -n for a dry-run. http://gitready.com/beginner/2009/01/16/cleaning-up-untracked-files.html
It depends on your definition of “last”. for a given branch (like master), GET /repos/:owner/:repo/commits/master is indeed the last (most recent) commit. But you can also consider the last push event: that would represent the last and most recent commit done (on any branch), pushed by a user to this repo.
Step 1: Unset existing credentials Copy this into your terminal: git config –global –unset credential.helper git credential-osxkeychain erase host=github.com protocol=https and hit ‘Enter’ twice to delete existing GitHub credentials (username and password) from your computer. Recommended: if you were previously authenticating using a GitHub Personal Access Token (PAT) and want to update to a new … Read more
Yesterday I had similar issue after a lot of cherry-pick from (and to) a side branch where I after merged with my main branch. A lot of conflicts with identical change. I solved this with a merge strategy: git checkout main-branch merge –no-commit -s recursive -X ours side-branch you can change “ours” to “theirs”. Be … Read more
There is no such feature for VS code. But you can install some git extensions to view and resolve conflict files easily. Such as you can install the extension Git Lens, and when you open conflict files -> click Toggle File Blame, there will shows which lines were you committed and which lines are new … Read more
If the first SHA is HEAD you can also use this approach: git reset –soft $OLD_SHA; git add -A; git commit –amend –no-edit be careful, this command will change the history of the repo. If you want to squash commits that are in the middle of your history: |—* — 0 — 1 —- 2 … Read more
According to this post in the Swift forums, the .swiftpm directory “is intended as a place for tools that operate on packages to store state or configuration files of their own that users are not expected to edit directly as source” – it is not exclusive to Xcode support. So to add it to .gitignore … Read more
When from my branch MyBranch and doing a rebase like git rebase master and having a conflict which is incoming change? and which is current change? When rebasing MyBranch onto master, “incoming” is the branch you have checked out, which is MyBranch, and “current” is master. The reason is because of what rebase actually does … Read more
2022: I described last August in “Git interactive rebase: how to move other branches (refs) automatically?” a new rebase option –update-refs (Git 2.38, Q3 2022): Automatically force-update any branches that point to commits that are being rebased. Any branches that are checked out in a worktree are not updated in this way. branch1 branch2 | … Read more
Merge Request and Pull request basically refers to same thing. Tools such as GitHub and Bitbucket choose the name pull request since the first manual action would be to pull the feature branch. Tools such as GitLab and Gitorious choose the name merge request since that is the final action that is requested of the … Read more