Comments (4)
jakobehn
commented on August 15, 2024
I can't really say anything about the merge conflict without looking at the repo. With regards to the state after performing a manual merge, you should be able to run Finish Hotfix again. Since there is nothing to merge, nothing will happen with respect to that, and the HF branch will be removed. Did you try this?
from gitflow.vs.
pcolmer
commented on August 15, 2024
I have successfully finished the hotfix via the command line. It wasn't possible to do it via the GUI as the GUI didn't think I was still working on a hotfix.
from gitflow.vs.
jakobehn
commented on August 15, 2024
Did you try it, from the Other Actions menu? I'm guessing that when you ran Finish the first time it did switch your current branch to develop, which would cause the extension to not suggest Finish hotfix as the recommended action. But you can always find all actions in the Other Actions menu
from gitflow.vs.
pcolmer
commented on August 15, 2024
I thought I had looked on the Other Actions menu but I clearly hadn't!
Thanks.
from gitflow.vs.
Related Issues (20)
- The future of GitFlow is unsure HOT 13
- GitFlow for VS2022 HOT 5
- Issue running install in Visual Studio 2019 HOT 10
- Visual Studio 2022 Support HOT 1
- Timeout and Reload message in VS2019
- How to change the remote name 'origin' to a different one?
- Multiple repo
- VS 2017 An exception was thrown while initializing part "GitFlowVS.Extension.GitFlowActionSection" HOT 3
- support vs 2019 HOT 5
- GitFlow not preserved as a tab HOT 1
- No error notification if there's a failure when creating a release HOT 3
- Tests do not work anymore after finishing a feature.
- Support for Visual Studio 2019 HOT 2
- Upgrade GitFlow scripts from AVH repo HOT 2
- Consider implementing GVFS Protocol so extension will be compatible with VFS for Git HOT 1
- GitFlow button not appearing HOT 4
- Problem create new feature with subfolder HOT 5
- Visual Studio 16.8 has a new Git tool windows. GitFlow should be moved out of Team Explorer window. HOT 1
- Plugin not installed or initialize does nothing
- Giflow button click throws an error. Could not load an assembly. 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 gitflow.vs.