So, say you are leaving your current development branch in git to a standard base branch of your repository-- you checkout the branch in your local environment then you pull from the remote and lo and behold there is a merge conflict.
Not committing merge; use 'git commit' to complete the merge.
What I usually want to do is to:
git checkout remote/branch local/path/to/file
Here's to no more 'github shenanigans commit messages...'
Not committing merge; use 'git commit' to complete the merge.
What I usually want to do is to:
git checkout remote/branch local/path/to/file
Here's to no more 'github shenanigans commit messages...'
