ilostmymangoman
Joined 16 years ago
Karma
11
Submissions
3
Member since
Mar 14
Recent submissions
Comment · 8 months ago
As of git 2.52, it's possible to use (:optional) to avoid errors in repositories that don't have this file https://stackoverflow.com/a/79824780
Comment · 2 years ago
When conflicts occur when performing rebase, git prints out the following:
```
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
```
The options on how to proceed seem pretty clear to me.
Comment · 5 years ago
Please note that Ctrl-C does not do the same thing as Esc or Ctrl-[.
More info: https://unix.stackexchange.com/questions/53633/does-using-ct...