ember-try | cli addon to test against multiple bower | Addon library
kandi X-RAY | ember-try Summary
kandi X-RAY | ember-try Summary
An ember-cli addon to test against multiple bower and npm dependencies, such as ember and ember-data.
Support
Quality
Security
License
Reuse
Top functions reviewed by kandi - BETA
Currently covering the most popular Java, JavaScript and Python libraries. See a Sample of ember-try
ember-try Key Features
ember-try Examples and Code Snippets
Community Discussions
Trending Discussions on ember-try
QUESTION
Recently I've started working with Git at my company and I'm noticing something strange and I cannot figure out what is going on under the hood.
So for the workflow we have a repository and the policy is that we have to make a branch whenever we want to work on the project, which is fairly straight forward and it makes sense.
The issue I'm experiencing is whenever I'm done working in a branch i stage whatever is left and push my final commit, then I create a pull request and it has to pass code review before the merge.
However, when the pull request is approved and the changes merged to master I want to delete my branch locally (as it is auto deleted when merging on origin anyway). This is actually not so straight forward as I would expect.
What happens is that if I attempt to delete my branch or checkout another branch, git will prevent me because it wants me to know that I have changes not staged for commit. This is the part that makes no sense to me, everything I've done has been commited, reviewed and merged, so what are these changes?
What I've done so far is use "git add ". Now I can inspect it, to see what kind of changes has been made here, since it says It contains changes. This is the second weird thing, there is no changes at all.
So for the time being I'm resolving these issues manually, but it gets time consuming when I have to do this with every branch. Have I missed something obvious? Am I doing something wrong?
This happend again today, although slightly different, but the end result was the same. I had finished a feature, cleaned up the branch (no issues with that today), so what I wanted to do when that feature branch was deleted, was to checkout master and pull changes to ensure I was at the latest revision and then what I wrote above happend in master. I had all latest changes, yet git was telling me I had unstaged changes (again no changes at all when inspecting these files).
Minor update: git status -u only says that my branch is up to date with origin/HEAD and that I have unstaged changes (listing those files) and that's about it, again hidden from Visual Studio Code changes section. The only choices I have is to stage them ("git add", making them visible in the editor) or discard them (git checkout "file name").
gitignore:
...ANSWER
Answered 2019-Feb-27 at 13:56TL;DR
1) Make sure you do the git diff
without -b
or -w
and with core.autocrlf=false
.
2) You can reset all the changed files at once with git reset --hard
if you're sure you have no further changes you want to commit.
Details
Diff
When git status
and git diff
disagree on what files are changes, it can be due to whitespace issues, especially newline styles if you are working on Windows.
For example, I did this test on Windows:
- Change file
a
from Linux newline to Windows-style CRLF git status
saysa
is changed (regardless ofcore.autocrlf
settings)git diff
shows the change ina
whencore.autocrlf=false
git diff
shows not changes at all whencore.autocrlf=true
- similarly,
git diff -b
andgit diff -w
show no changes.
Reset
Now, if you know you have no changes of value in your sandbox, e.g., all the changes are due to line-endings, you can reset the whole sandbox to the state in HEAD
with this command:
Community Discussions, Code Snippets contain sources that include Stack Exchange Network
Vulnerabilities
No vulnerabilities reported
Install ember-try
Support
Reuse Trending Solutions
Find, review, and download reusable Libraries, Code Snippets, Cloud APIs from over 650 million Knowledge Items
Find more librariesStay Updated
Subscribe to our newsletter for trending solutions and developer bootcamps
Share this Page