Have you tried reverting the revert? They reverted your commit using git revert <your commit id> The revert itself is a commit and has its own commit id. So now you need to do git revert <the commit id of his revert-commit>
Git distinguishes between authors and committers (see Difference between author and committer in Git?). Authors are the people who wrote a specific piece of code – committers are the people who put these changes into the git “history”. Normally both are the same (and doesn’t change on merging, cloning, pushing or pulling). Causing the two … Read more
There should be a way to reference a GitLab issue from a commit message, simply with #xx (id of the issue). Consider “Default closing pattern value “ For example the following commit message: Awesome commit message Fix #20, Fixes #21 and Closes group/otherproject#22. This commit is also related to #17 and fixes #18, #19 and … Read more
What is this file? You can open it in property list editor and have a look — It stores things like your workspace/project document layouts, nothing you would lose sleep over if lost. Can I ignore this file? You would ignore it in all but exceptional cases. It’s easily reconstructed, and should be considered local … Read more
Revert recursively from the top of your working copy: svn revert -R . You will need to manually delete the files that were added. As in after reverting, the files added will remain on disk but they will be in a non-tracked state (“? foo”)
You want to do this: git add -u git reset HEAD path/to/file git commit Be sure and do this from the top level of the repo; add -u adds changes in the current directory (recursively). The key line tells git to reset the version of the given path in the index (the staging area for … Read more
What you are seeing means that automatic merge could not resolve the conflicts in the files. You need to resolve these conflicts manually. Run git mergetool or git gui.
The guideline for the Git project itself (and the Linux project, AFAIK) is one commit per “logically separate changeset”. This is a little ambiguous, but you probably don’t want to commit every few days if you’re working on a project constantly, and you probably don’t want to commit after every function change – if you’ve … Read more
Because your commit isn’t on any branch, you can’t see it in the working directory unless you checkout that specific commit, using its SHA1. You can find the commit by looking at the reflog which tracks changes in what you have checked out from the repo. If your tag was XXX you’ll see something like: … Read more
pagers to the rescue git log | less Make sure you don’t have -S on an alias for less Also, it is generally considered good practice to limit the width for commit messages. I believe a common standard is 78 chars (IIRC), and most texteditors do a good job of ensuring such style rules (auto … Read more