From b66fc8c46c0ebbcdffd4b36152825b963d1eb581 Mon Sep 17 00:00:00 2001 From: MrPyriteMiner Date: Sun, 15 Sep 2024 11:36:16 +0200 Subject: [PATCH] Added even more useful commands --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6992ffe..f3a4e32 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,13 @@ # Hello World git commit -a -m "Message" -This command adds all modified files, but not new ones, to a commit immediately. \ No newline at end of file +This command adds all modified files, but not new ones, to a commit immediately. + +If someone else already commit smth, pull it with +git pull -r +Now you start resolving conflicts. If there's a conflict, you gotta deal with it. Keep doing that till you're done +--> Happiness +continue with "git rebase --continue" +then you can pmossibly change the commit message +then you can push +git log +exists as a log of what happened \ No newline at end of file