Hang in there. Everyone goes through this.
99% of the issues come from not quite understanding how git tracks changes when you try to merge.
Frustrating but learnable.
.05% come from a bad rebase. This is a hellscape.
.05% is forgetting to add a file when you commit.
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Hang in there. Everyone goes through this.
99% of the issues come from not quite understanding how git tracks changes when you try to merge.
Frustrating but learnable.
.05% come from a bad rebase. This is a hellscape.
.05% is forgetting to add a file when you commit.