Comments (3)
Can you describe which steps you take to reproduce the problem?
from gitflow4idea.
I start two different feature branches. Make and commit changes in each, but at different lines, so they don't conflict. I finish the features. When I finish the second feature, it gets merged into develop which also contains the change from the first feature, but the contents of the file in my view don't get updated.
from gitflow4idea.
Ok, I can reproduce it. The fix for #11 which I'm working on should take care of this.
from gitflow4idea.
Related Issues (20)
- Reading Git repository information should not be done on the EDT HOT 2
- Do not call synchronous repository update in EDT HOT 1
- Unsupported Git Flow Version HOT 11
- Unsupported Git Flow Version for 1.12.3 (AVH Edition) HOT 9
- IDE Fatal Errors HOT 2
- Assertion failed: dataContext has no component for new ListPopupStep HOT 1
- 2021.2 Compatibility HOT 6
- After updating WebStorm to version 2021.2, the plugin broke HOT 2
- Exception: cannot share data context between Swing events HOT 7
- Please update for last IDE version. HOT 1
- IDE Fatal Error on Init Repo HOT 3
- Null Pointer when finishing branch: "branch was merged into null" HOT 1
- Gitflow repository initialization stucks HOT 1
- Execute command on all repos in "Open task" widget
- Access from event dispatch thread is not allowed.
- 2021.3 Compatibility HOT 29
- java.lang.Throwable: Assertion failed: dataContext has no component for new ListPopupStep
- Contributors
- Can we support IntelliJ IDEA 2022.1.1 HOT 1
- Unsupported git flow version HOT 2
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 gitflow4idea.