Comments (3)
*unmerged files meinte ich :-)
from felixwiedemann.
Öffne mal Terminal und wechsle in dein Projektverzeichnis und gebe folgendes ein:
find . -name '.DS_Store' -type f -delete
Das Problem ist, dass diese Dateien nicht im zentralen Repository mehr existieren, bei dir aber schon. Ich habe sie mittlerweile so eingestellt, dass Git sie ignoriert aber du hast noch einen älteren Stand.
Kannst du danach mal probieren git pull --rebase
und dann falls es immer noch Fehler gibt nochmal den Screenshot posten?
from felixwiedemann.
Hi Simon,
Habe ausgeführt: find . -name '.DS_Store' -type f -delete
Dann git pull --rebase , dann kam folgende Meldung :
from felixwiedemann.
Related Issues (20)
- sitemap.xml and robots.txt HOT 2
- Speed up server upload task HOT 1
- Bug in Safari 9.1.3 HOT 5
- Inline main.css code HOT 1
- Basic Internet Explorer support HOT 1
- Lazy loading of framegrab images HOT 1
- Browser caches changed JSON files HOT 1
- Improve caching of asynchronous loaded content
- Contact: Wie bist Du zu erreichen ?
- Server upload limit HOT 1
- Deactivate Auto-Play for Videos
- Multiple Videos per project page + Video Description Text Format & Space
- Assign Posterframe for Embedded Player
- Position Introslide on Mobile & Tablet Vertical Mode HOT 4
- Adjust Text Size in Header 'Felix Wiedemann BSC' HOT 4
- Dark Mode Favicon HOT 2
- SEO / Tab Name HOT 1
- Thumb Layout 2020 HOT 3
- Split films and series
- Chrome navigation font bug HOT 1
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from felixwiedemann.